From: magnus.blaudd Date: April 20 2012 6:37am Subject: bzr push into mysql-trunk-cluster branch (magnus.blaudd:3478 to 3479) WL#6224 List-Archive: http://lists.mysql.com/commits/143492 Message-Id: <201204200637.q3K6bvM3007108@acsmt357.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3479 magnus.blaudd@stripped 2012-04-20 WL#6224 Adapt MySQL Cluster to 5.6 - record new .result file for two test cases which does SHOW CREATE TABLE on tables with COLUMN_FORMAT and STORAGE since those are now marked with !050606 instead of !050120 modified: mysql-test/suite/ndb/r/ndb_alter_table_backup.result mysql-test/suite/ndb/r/ndb_column_properties.result 3478 magnus.blaudd@stripped 2012-04-19 [merge] Merge trunk-cluster-base -> trunk-cluster-stage modified: include/mysql_com.h mysql-test/r/tablespace.result mysql-test/t/tablespace.test sql/field.h sql/handler.h sql/lex.h sql/sql_show.cc sql/sql_table.cc sql/sql_yacc.yy sql/table.cc sql/unireg.cc === modified file 'mysql-test/suite/ndb/r/ndb_alter_table_backup.result' --- a/mysql-test/suite/ndb/r/ndb_alter_table_backup.result 2011-01-27 15:37:42 +0000 +++ b/mysql-test/suite/ndb/r/ndb_alter_table_backup.result 2012-04-20 06:35:42 +0000 @@ -10,7 +10,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(10) unsigned NOT NULL AUTO_INCREMENT, - `b` int(11) /*!50120 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL, + `b` int(11) /*!50606 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL, `c` float DEFAULT NULL, `d` double unsigned DEFAULT NULL, `e` decimal(5,2) DEFAULT NULL, @@ -35,7 +35,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(10) unsigned NOT NULL AUTO_INCREMENT, - `b` int(11) /*!50120 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL, + `b` int(11) /*!50606 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL, `c` float DEFAULT NULL, `d` double unsigned DEFAULT NULL, `e` decimal(5,2) DEFAULT NULL, === modified file 'mysql-test/suite/ndb/r/ndb_column_properties.result' --- a/mysql-test/suite/ndb/r/ndb_column_properties.result 2012-01-02 16:31:33 +0000 +++ b/mysql-test/suite/ndb/r/ndb_column_properties.result 2012-04-20 06:35:42 +0000 @@ -16,7 +16,7 @@ Warning 1478 DYNAMIC column a with STORA show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` int(11) /*!50120 STORAGE DISK */ /*!50120 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL + `a` int(11) /*!50606 STORAGE DISK */ /*!50606 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL ) /*!50100 TABLESPACE ts1 */ ENGINE=ndbcluster DEFAULT CHARSET=latin1 Attributes: a Int NULL AT=FIXED ST=DISK @@ -47,18 +47,18 @@ Warning 1478 DYNAMIC column f1 with STOR show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` int(11) /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL, - `a1` int(11) /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL, - `b` int(11) NOT NULL /*!50120 COLUMN_FORMAT DYNAMIC */, - `b1` int(11) NOT NULL /*!50120 STORAGE DISK */ /*!50120 COLUMN_FORMAT FIXED */, - `c` varchar(100) /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL, - `c1` varchar(100) /*!50120 STORAGE MEMORY */ /*!50120 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL, - `d` varchar(100) NOT NULL /*!50120 COLUMN_FORMAT FIXED */, - `d1` varchar(100) NOT NULL /*!50120 COLUMN_FORMAT DYNAMIC */, - `e` char(100) /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL, - `e1` char(100) /*!50120 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL, - `f` char(100) NOT NULL /*!50120 COLUMN_FORMAT FIXED */, - `f1` char(100) NOT NULL /*!50120 STORAGE DISK */ /*!50120 COLUMN_FORMAT DYNAMIC */, + `a` int(11) /*!50606 COLUMN_FORMAT FIXED */ DEFAULT NULL, + `a1` int(11) /*!50606 COLUMN_FORMAT FIXED */ DEFAULT NULL, + `b` int(11) NOT NULL /*!50606 COLUMN_FORMAT DYNAMIC */, + `b1` int(11) NOT NULL /*!50606 STORAGE DISK */ /*!50606 COLUMN_FORMAT FIXED */, + `c` varchar(100) /*!50606 COLUMN_FORMAT FIXED */ DEFAULT NULL, + `c1` varchar(100) /*!50606 STORAGE MEMORY */ /*!50606 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL, + `d` varchar(100) NOT NULL /*!50606 COLUMN_FORMAT FIXED */, + `d1` varchar(100) NOT NULL /*!50606 COLUMN_FORMAT DYNAMIC */, + `e` char(100) /*!50606 COLUMN_FORMAT FIXED */ DEFAULT NULL, + `e1` char(100) /*!50606 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL, + `f` char(100) NOT NULL /*!50606 COLUMN_FORMAT FIXED */, + `f1` char(100) NOT NULL /*!50606 STORAGE DISK */ /*!50606 COLUMN_FORMAT DYNAMIC */, KEY `b` (`b`) ) /*!50100 TABLESPACE ts1 */ ENGINE=ndbcluster DEFAULT CHARSET=latin1 alter table t1 change column a a int storage disk; @@ -67,18 +67,18 @@ Warning 1478 DYNAMIC column f1 with STOR show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` int(11) /*!50120 STORAGE DISK */ DEFAULT NULL, - `a1` int(11) /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL, - `b` int(11) NOT NULL /*!50120 COLUMN_FORMAT DYNAMIC */, - `b1` int(11) NOT NULL /*!50120 STORAGE DISK */ /*!50120 COLUMN_FORMAT FIXED */, - `c` varchar(100) /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL, - `c1` varchar(100) /*!50120 STORAGE MEMORY */ /*!50120 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL, - `d` varchar(100) NOT NULL /*!50120 COLUMN_FORMAT FIXED */, - `d1` varchar(100) NOT NULL /*!50120 COLUMN_FORMAT DYNAMIC */, - `e` char(100) /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL, - `e1` char(100) /*!50120 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL, - `f` char(100) NOT NULL /*!50120 COLUMN_FORMAT FIXED */, - `f1` char(100) NOT NULL /*!50120 STORAGE DISK */ /*!50120 COLUMN_FORMAT DYNAMIC */, + `a` int(11) /*!50606 STORAGE DISK */ DEFAULT NULL, + `a1` int(11) /*!50606 COLUMN_FORMAT FIXED */ DEFAULT NULL, + `b` int(11) NOT NULL /*!50606 COLUMN_FORMAT DYNAMIC */, + `b1` int(11) NOT NULL /*!50606 STORAGE DISK */ /*!50606 COLUMN_FORMAT FIXED */, + `c` varchar(100) /*!50606 COLUMN_FORMAT FIXED */ DEFAULT NULL, + `c1` varchar(100) /*!50606 STORAGE MEMORY */ /*!50606 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL, + `d` varchar(100) NOT NULL /*!50606 COLUMN_FORMAT FIXED */, + `d1` varchar(100) NOT NULL /*!50606 COLUMN_FORMAT DYNAMIC */, + `e` char(100) /*!50606 COLUMN_FORMAT FIXED */ DEFAULT NULL, + `e1` char(100) /*!50606 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL, + `f` char(100) NOT NULL /*!50606 COLUMN_FORMAT FIXED */, + `f1` char(100) NOT NULL /*!50606 STORAGE DISK */ /*!50606 COLUMN_FORMAT DYNAMIC */, KEY `b` (`b`) ) /*!50100 TABLESPACE ts1 */ ENGINE=ndbcluster DEFAULT CHARSET=latin1 Attributes: @@ -101,18 +101,18 @@ Warning 1478 DYNAMIC column f1 with STOR show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` int(11) /*!50120 STORAGE MEMORY */ DEFAULT NULL, - `a1` int(11) /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL, - `b` int(11) NOT NULL /*!50120 COLUMN_FORMAT DYNAMIC */, - `b1` int(11) NOT NULL /*!50120 STORAGE DISK */ /*!50120 COLUMN_FORMAT FIXED */, - `c` varchar(100) /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL, - `c1` varchar(100) /*!50120 STORAGE MEMORY */ /*!50120 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL, - `d` varchar(100) NOT NULL /*!50120 COLUMN_FORMAT FIXED */, - `d1` varchar(100) NOT NULL /*!50120 COLUMN_FORMAT DYNAMIC */, - `e` char(100) /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL, - `e1` char(100) /*!50120 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL, - `f` char(100) NOT NULL /*!50120 COLUMN_FORMAT FIXED */, - `f1` char(100) NOT NULL /*!50120 STORAGE DISK */ /*!50120 COLUMN_FORMAT DYNAMIC */, + `a` int(11) /*!50606 STORAGE MEMORY */ DEFAULT NULL, + `a1` int(11) /*!50606 COLUMN_FORMAT FIXED */ DEFAULT NULL, + `b` int(11) NOT NULL /*!50606 COLUMN_FORMAT DYNAMIC */, + `b1` int(11) NOT NULL /*!50606 STORAGE DISK */ /*!50606 COLUMN_FORMAT FIXED */, + `c` varchar(100) /*!50606 COLUMN_FORMAT FIXED */ DEFAULT NULL, + `c1` varchar(100) /*!50606 STORAGE MEMORY */ /*!50606 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL, + `d` varchar(100) NOT NULL /*!50606 COLUMN_FORMAT FIXED */, + `d1` varchar(100) NOT NULL /*!50606 COLUMN_FORMAT DYNAMIC */, + `e` char(100) /*!50606 COLUMN_FORMAT FIXED */ DEFAULT NULL, + `e1` char(100) /*!50606 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL, + `f` char(100) NOT NULL /*!50606 COLUMN_FORMAT FIXED */, + `f1` char(100) NOT NULL /*!50606 STORAGE DISK */ /*!50606 COLUMN_FORMAT DYNAMIC */, KEY `b` (`b`) ) /*!50100 TABLESPACE ts1 */ ENGINE=ndbcluster DEFAULT CHARSET=latin1 Attributes: @@ -138,19 +138,19 @@ Warning 1478 DYNAMIC column f1 with STOR show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` int(11) /*!50120 STORAGE MEMORY */ DEFAULT NULL, - `a1` int(11) /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL, - `b` int(11) NOT NULL /*!50120 STORAGE MEMORY */, - `b1` int(11) NOT NULL /*!50120 STORAGE DISK */ /*!50120 COLUMN_FORMAT FIXED */, - `c` varchar(100) /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL, - `c1` varchar(100) /*!50120 STORAGE MEMORY */ /*!50120 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL, - `d` varchar(100) NOT NULL /*!50120 COLUMN_FORMAT FIXED */, - `d1` varchar(100) NOT NULL /*!50120 COLUMN_FORMAT DYNAMIC */, - `e` char(100) /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL, - `e1` char(100) /*!50120 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL, - `f` char(100) NOT NULL /*!50120 COLUMN_FORMAT FIXED */, - `f1` char(100) NOT NULL /*!50120 STORAGE DISK */ /*!50120 COLUMN_FORMAT DYNAMIC */, - `a2` int(11) /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL, + `a` int(11) /*!50606 STORAGE MEMORY */ DEFAULT NULL, + `a1` int(11) /*!50606 COLUMN_FORMAT FIXED */ DEFAULT NULL, + `b` int(11) NOT NULL /*!50606 STORAGE MEMORY */, + `b1` int(11) NOT NULL /*!50606 STORAGE DISK */ /*!50606 COLUMN_FORMAT FIXED */, + `c` varchar(100) /*!50606 COLUMN_FORMAT FIXED */ DEFAULT NULL, + `c1` varchar(100) /*!50606 STORAGE MEMORY */ /*!50606 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL, + `d` varchar(100) NOT NULL /*!50606 COLUMN_FORMAT FIXED */, + `d1` varchar(100) NOT NULL /*!50606 COLUMN_FORMAT DYNAMIC */, + `e` char(100) /*!50606 COLUMN_FORMAT FIXED */ DEFAULT NULL, + `e1` char(100) /*!50606 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL, + `f` char(100) NOT NULL /*!50606 COLUMN_FORMAT FIXED */, + `f1` char(100) NOT NULL /*!50606 STORAGE DISK */ /*!50606 COLUMN_FORMAT DYNAMIC */, + `a2` int(11) /*!50606 COLUMN_FORMAT FIXED */ DEFAULT NULL, KEY `b` (`b`) ) /*!50100 TABLESPACE ts1 */ ENGINE=ndbcluster DEFAULT CHARSET=latin1 Attributes: @@ -174,20 +174,20 @@ Warning 1478 DYNAMIC column f1 with STOR show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` int(11) /*!50120 STORAGE MEMORY */ DEFAULT NULL, - `a1` int(11) /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL, - `b` int(11) NOT NULL /*!50120 STORAGE MEMORY */, - `b1` int(11) NOT NULL /*!50120 STORAGE DISK */ /*!50120 COLUMN_FORMAT FIXED */, - `c` varchar(100) /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL, - `c1` varchar(100) /*!50120 STORAGE MEMORY */ /*!50120 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL, - `d` varchar(100) NOT NULL /*!50120 COLUMN_FORMAT FIXED */, - `d1` varchar(100) NOT NULL /*!50120 COLUMN_FORMAT DYNAMIC */, - `e` char(100) /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL, - `e1` char(100) /*!50120 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL, - `f` char(100) NOT NULL /*!50120 COLUMN_FORMAT FIXED */, - `f1` char(100) NOT NULL /*!50120 STORAGE DISK */ /*!50120 COLUMN_FORMAT DYNAMIC */, - `a2` int(11) /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL, - `c2` varchar(100) /*!50120 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL, + `a` int(11) /*!50606 STORAGE MEMORY */ DEFAULT NULL, + `a1` int(11) /*!50606 COLUMN_FORMAT FIXED */ DEFAULT NULL, + `b` int(11) NOT NULL /*!50606 STORAGE MEMORY */, + `b1` int(11) NOT NULL /*!50606 STORAGE DISK */ /*!50606 COLUMN_FORMAT FIXED */, + `c` varchar(100) /*!50606 COLUMN_FORMAT FIXED */ DEFAULT NULL, + `c1` varchar(100) /*!50606 STORAGE MEMORY */ /*!50606 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL, + `d` varchar(100) NOT NULL /*!50606 COLUMN_FORMAT FIXED */, + `d1` varchar(100) NOT NULL /*!50606 COLUMN_FORMAT DYNAMIC */, + `e` char(100) /*!50606 COLUMN_FORMAT FIXED */ DEFAULT NULL, + `e1` char(100) /*!50606 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL, + `f` char(100) NOT NULL /*!50606 COLUMN_FORMAT FIXED */, + `f1` char(100) NOT NULL /*!50606 STORAGE DISK */ /*!50606 COLUMN_FORMAT DYNAMIC */, + `a2` int(11) /*!50606 COLUMN_FORMAT FIXED */ DEFAULT NULL, + `c2` varchar(100) /*!50606 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL, KEY `b` (`b`) ) /*!50100 TABLESPACE ts1 */ ENGINE=ndbcluster DEFAULT CHARSET=latin1 Attributes: @@ -212,21 +212,21 @@ Warning 1478 DYNAMIC column f1 with STOR show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` int(11) /*!50120 STORAGE MEMORY */ DEFAULT NULL, - `a1` int(11) /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL, - `b` int(11) NOT NULL /*!50120 STORAGE MEMORY */, - `b1` int(11) NOT NULL /*!50120 STORAGE DISK */ /*!50120 COLUMN_FORMAT FIXED */, - `c` varchar(100) /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL, - `c1` varchar(100) /*!50120 STORAGE MEMORY */ /*!50120 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL, - `d` varchar(100) NOT NULL /*!50120 COLUMN_FORMAT FIXED */, - `d1` varchar(100) NOT NULL /*!50120 COLUMN_FORMAT DYNAMIC */, - `e` char(100) /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL, - `e1` char(100) /*!50120 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL, - `f` char(100) NOT NULL /*!50120 COLUMN_FORMAT FIXED */, - `f1` char(100) NOT NULL /*!50120 STORAGE DISK */ /*!50120 COLUMN_FORMAT DYNAMIC */, - `a2` int(11) /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL, - `c2` varchar(100) /*!50120 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL, - `c3` varchar(100) /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL, + `a` int(11) /*!50606 STORAGE MEMORY */ DEFAULT NULL, + `a1` int(11) /*!50606 COLUMN_FORMAT FIXED */ DEFAULT NULL, + `b` int(11) NOT NULL /*!50606 STORAGE MEMORY */, + `b1` int(11) NOT NULL /*!50606 STORAGE DISK */ /*!50606 COLUMN_FORMAT FIXED */, + `c` varchar(100) /*!50606 COLUMN_FORMAT FIXED */ DEFAULT NULL, + `c1` varchar(100) /*!50606 STORAGE MEMORY */ /*!50606 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL, + `d` varchar(100) NOT NULL /*!50606 COLUMN_FORMAT FIXED */, + `d1` varchar(100) NOT NULL /*!50606 COLUMN_FORMAT DYNAMIC */, + `e` char(100) /*!50606 COLUMN_FORMAT FIXED */ DEFAULT NULL, + `e1` char(100) /*!50606 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL, + `f` char(100) NOT NULL /*!50606 COLUMN_FORMAT FIXED */, + `f1` char(100) NOT NULL /*!50606 STORAGE DISK */ /*!50606 COLUMN_FORMAT DYNAMIC */, + `a2` int(11) /*!50606 COLUMN_FORMAT FIXED */ DEFAULT NULL, + `c2` varchar(100) /*!50606 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL, + `c3` varchar(100) /*!50606 COLUMN_FORMAT FIXED */ DEFAULT NULL, KEY `b` (`b`) ) /*!50100 TABLESPACE ts1 */ ENGINE=ndbcluster DEFAULT CHARSET=latin1 Attributes: @@ -252,7 +252,7 @@ alter table t1 change column a a int sto show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` int(11) /*!50120 STORAGE MEMORY */ /*!50120 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL + `a` int(11) /*!50606 STORAGE MEMORY */ /*!50606 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL ) /*!50100 TABLESPACE ts1 */ ENGINE=ndbcluster DEFAULT CHARSET=latin1 Attributes: a Int NULL AT=FIXED ST=MEMORY DYNAMIC @@ -262,8 +262,8 @@ create table t1 (column_format int stora show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `column_format` int(11) /*!50120 STORAGE DISK */ /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL, - `storage` int(11) /*!50120 STORAGE DISK */ /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL + `column_format` int(11) /*!50606 STORAGE DISK */ /*!50606 COLUMN_FORMAT FIXED */ DEFAULT NULL, + `storage` int(11) /*!50606 STORAGE DISK */ /*!50606 COLUMN_FORMAT FIXED */ DEFAULT NULL ) /*!50100 TABLESPACE ts1 */ ENGINE=ndbcluster DEFAULT CHARSET=latin1 Attributes: column_format Int NULL AT=FIXED ST=DISK No bundle (reason: useless for push emails).