From: magnus.blaudd Date: March 13 2012 2:40pm Subject: bzr push into mysql-trunk branch (magnus.blaudd:3733 to 3734) WL#5961 List-Archive: http://lists.mysql.com/commits/143183 Message-Id: <201203131440.q2DEege4004200@acsmt358.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3734 magnus.blaudd@stripped 2012-03-13 WL#5961 - fix review comments - the "magic version" should be 5.6.6 although this syntax is understood by MySQL Cluster from 5.1.20 - update .result file modified: mysql-test/r/tablespace.result sql/sql_show.cc 3733 magnus.blaudd@stripped 2012-03-08 Fix result files for perfschema digest after changing parser for WL#5961 modified: mysql-test/suite/perfschema/r/digest_table_full.result mysql-test/suite/perfschema/r/statement_digest.result mysql-test/suite/perfschema/r/statement_digest_consumers.result mysql-test/suite/perfschema/r/statement_digest_long_query.result === modified file 'mysql-test/r/tablespace.result' --- a/mysql-test/r/tablespace.result 2012-03-08 19:28:40 +0000 +++ b/mysql-test/r/tablespace.result 2012-03-13 14:37:22 +0000 @@ -98,15 +98,15 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL, `b` int(11) DEFAULT NULL, - `c` int(11) /*!50120 STORAGE DISK */ DEFAULT NULL, - `d` int(11) NOT NULL /*!50120 STORAGE MEMORY */, - `e` int(11) /*!50120 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL, - `f` int(11) /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL, + `c` int(11) /*!50606 STORAGE DISK */ DEFAULT NULL, + `d` int(11) NOT NULL /*!50606 STORAGE MEMORY */, + `e` int(11) /*!50606 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL, + `f` int(11) /*!50606 COLUMN_FORMAT FIXED */ DEFAULT NULL, `g` int(11) DEFAULT NULL, - `h` int(11) NOT NULL /*!50120 STORAGE DISK */ /*!50120 COLUMN_FORMAT DYNAMIC */, - `i` int(11) /*!50120 STORAGE MEMORY */ /*!50120 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL, - `j` int(11) /*!50120 STORAGE DISK */ /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL, - `k` int(11) /*!50120 STORAGE MEMORY */ /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL, + `h` int(11) NOT NULL /*!50606 STORAGE DISK */ /*!50606 COLUMN_FORMAT DYNAMIC */, + `i` int(11) /*!50606 STORAGE MEMORY */ /*!50606 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL, + `j` int(11) /*!50606 STORAGE DISK */ /*!50606 COLUMN_FORMAT FIXED */ DEFAULT NULL, + `k` int(11) /*!50606 STORAGE MEMORY */ /*!50606 COLUMN_FORMAT FIXED */ DEFAULT NULL, PRIMARY KEY (`a`) ) /*!50100 TABLESPACE the_tablespacename STORAGE DISK */ ENGINE=MyISAM DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -124,15 +124,15 @@ i int STORAGE MEMORY COLUMN_FORMAT FIXED SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` int(11) /*!50120 STORAGE DISK */ DEFAULT NULL, - `b` int(11) NOT NULL /*!50120 STORAGE MEMORY */, - `c` int(11) /*!50120 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL, - `d` int(11) /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL, + `a` int(11) /*!50606 STORAGE DISK */ DEFAULT NULL, + `b` int(11) NOT NULL /*!50606 STORAGE MEMORY */, + `c` int(11) /*!50606 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL, + `d` int(11) /*!50606 COLUMN_FORMAT FIXED */ DEFAULT NULL, `e` int(11) DEFAULT NULL, - `f` int(11) NOT NULL /*!50120 STORAGE DISK */ /*!50120 COLUMN_FORMAT DYNAMIC */, - `g` int(11) /*!50120 STORAGE MEMORY */ /*!50120 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL, - `h` int(11) /*!50120 STORAGE DISK */ /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL, - `i` int(11) /*!50120 STORAGE MEMORY */ /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL + `f` int(11) NOT NULL /*!50606 STORAGE DISK */ /*!50606 COLUMN_FORMAT DYNAMIC */, + `g` int(11) /*!50606 STORAGE MEMORY */ /*!50606 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL, + `h` int(11) /*!50606 STORAGE DISK */ /*!50606 COLUMN_FORMAT FIXED */ DEFAULT NULL, + `i` int(11) /*!50606 STORAGE MEMORY */ /*!50606 COLUMN_FORMAT FIXED */ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD COLUMN j int STORAGE DISK, @@ -147,23 +147,23 @@ ADD COLUMN r int STORAGE MEMORY COLUMN_F SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` int(11) /*!50120 STORAGE DISK */ DEFAULT NULL, - `b` int(11) NOT NULL /*!50120 STORAGE MEMORY */, - `c` int(11) /*!50120 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL, - `d` int(11) /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL, + `a` int(11) /*!50606 STORAGE DISK */ DEFAULT NULL, + `b` int(11) NOT NULL /*!50606 STORAGE MEMORY */, + `c` int(11) /*!50606 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL, + `d` int(11) /*!50606 COLUMN_FORMAT FIXED */ DEFAULT NULL, `e` int(11) DEFAULT NULL, - `f` int(11) NOT NULL /*!50120 STORAGE DISK */ /*!50120 COLUMN_FORMAT DYNAMIC */, - `g` int(11) /*!50120 STORAGE MEMORY */ /*!50120 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL, - `h` int(11) /*!50120 STORAGE DISK */ /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL, - `i` int(11) /*!50120 STORAGE MEMORY */ /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL, - `j` int(11) /*!50120 STORAGE DISK */ DEFAULT NULL, - `k` int(11) NOT NULL /*!50120 STORAGE MEMORY */, - `l` int(11) /*!50120 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL, - `m` int(11) /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL, + `f` int(11) NOT NULL /*!50606 STORAGE DISK */ /*!50606 COLUMN_FORMAT DYNAMIC */, + `g` int(11) /*!50606 STORAGE MEMORY */ /*!50606 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL, + `h` int(11) /*!50606 STORAGE DISK */ /*!50606 COLUMN_FORMAT FIXED */ DEFAULT NULL, + `i` int(11) /*!50606 STORAGE MEMORY */ /*!50606 COLUMN_FORMAT FIXED */ DEFAULT NULL, + `j` int(11) /*!50606 STORAGE DISK */ DEFAULT NULL, + `k` int(11) NOT NULL /*!50606 STORAGE MEMORY */, + `l` int(11) /*!50606 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL, + `m` int(11) /*!50606 COLUMN_FORMAT FIXED */ DEFAULT NULL, `n` int(11) DEFAULT NULL, - `o` int(11) NOT NULL /*!50120 STORAGE DISK */ /*!50120 COLUMN_FORMAT DYNAMIC */, - `p` int(11) /*!50120 STORAGE MEMORY */ /*!50120 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL, - `q` int(11) /*!50120 STORAGE DISK */ /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL, - `r` int(11) /*!50120 STORAGE MEMORY */ /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL + `o` int(11) NOT NULL /*!50606 STORAGE DISK */ /*!50606 COLUMN_FORMAT DYNAMIC */, + `p` int(11) /*!50606 STORAGE MEMORY */ /*!50606 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL, + `q` int(11) /*!50606 STORAGE DISK */ /*!50606 COLUMN_FORMAT FIXED */ DEFAULT NULL, + `r` int(11) /*!50606 STORAGE MEMORY */ /*!50606 COLUMN_FORMAT FIXED */ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 DROP TABLE t1; === modified file 'sql/sql_show.cc' --- a/sql/sql_show.cc 2012-03-08 19:28:40 +0000 +++ b/sql/sql_show.cc 2012-03-13 14:37:22 +0000 @@ -1545,10 +1545,10 @@ int store_create_info(THD *thd, TABLE_LI switch(field->field_storage_type()){ case HA_SM_DISK: - packet->append(STRING_WITH_LEN(" /*!50120 STORAGE DISK */")); + packet->append(STRING_WITH_LEN(" /*!50606 STORAGE DISK */")); break; case HA_SM_MEMORY: - packet->append(STRING_WITH_LEN(" /*!50120 STORAGE MEMORY */")); + packet->append(STRING_WITH_LEN(" /*!50606 STORAGE MEMORY */")); break; default: break; @@ -1556,10 +1556,10 @@ int store_create_info(THD *thd, TABLE_LI switch(field->column_format()){ case COLUMN_FORMAT_TYPE_FIXED: - packet->append(STRING_WITH_LEN(" /*!50120 COLUMN_FORMAT FIXED */")); + packet->append(STRING_WITH_LEN(" /*!50606 COLUMN_FORMAT FIXED */")); break; case COLUMN_FORMAT_TYPE_DYNAMIC: - packet->append(STRING_WITH_LEN(" /*!50120 COLUMN_FORMAT DYNAMIC */")); + packet->append(STRING_WITH_LEN(" /*!50606 COLUMN_FORMAT DYNAMIC */")); break; default: break; No bundle (reason: useless for push emails).