← Back to branch summary

~ubuntu-branches/ubuntu/trusty/mariadb-5.5/trusty-proposed

« back to all changes in this revision

Viewing changes to storage/pbxt/mysql-test/main/r/create-uca.rdiff

  • Committer: Package Import Robot
  • Author(s): James Page, Otto Kekäläinen
  • Date: 2014-02-17 16:51:52 UTC
  • mfrom: (2.1.1 sid)
  • Revision ID: package-import@ubuntu.com-20140217165152-k315d3175g865kkx
Tags: 5.5.35-1
http://bugs.debian.org/737597
http://bugs.debian.org/733002
http://bugs.debian.org/734426
http://bugs.debian.org/735284
http://bugs.debian.org/736480
http://bugs.debian.org/732967
[ Otto Kekäläinen ]
* New upstream release, fixing the following security issues:
  - Buffer overflow in client/mysql.cc (Closes: #737597).
    - CVE-2014-0001
  - http://www.oracle.com/technetwork/topics/security/cpujan2014-1972949.html
    - CVE-2013-5891
    - CVE-2013-5908
    - CVE-2014-0386
    - CVE-2014-0393
    - CVE-2014-0401
    - CVE-2014-0402
    - CVE-2014-0412
    - CVE-2014-0420
    - CVE-2014-0437
* Upstream https://mariadb.atlassian.net/browse/MDEV-4902
  fixes compatibility with Bison 3.0 (Closes: #733002)
* Updated Russian debconf translation (Closes: #734426)
* Updated Japanese debconf translation (Closes: #735284)
* Updated French debconf translation (Closes: #736480)
* Renamed SONAME properly (Closes: #732967)

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/pbxt/mysql-test/main/r/create-uca.rdiff
1
 
--- r/create-uca.result 2011-10-21 23:09:08.000000000 +0200
2
 
+++ r/create-uca.reject 2012-02-10 15:20:48.000000000 +0100
3
 
@@ -16,7 +16,7 @@
4
 
   `c4` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT 'a',
5
 
   `c5` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT 'b',
6
 
   `c6` varchar(255) COLLATE latin1_bin DEFAULT NULL
7
 
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_bin
8
 
+) ENGINE=PBXT DEFAULT CHARSET=latin1 COLLATE=latin1_bin
9
 
 CREATE TABLE t2 AS SELECT * FROM t1;
10
 
 SHOW CREATE TABLE t2;
11
 
 Table  Create Table
12
 
@@ -27,5 +27,5 @@
13
 
   `c4` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT 'a',
14
 
   `c5` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT 'b',
15
 
   `c6` varchar(255) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
16
 
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
17
 
+) ENGINE=PBXT DEFAULT CHARSET=latin1
18
 
 DROP TABLE t1,t2;