From: kevin.lewis Date: August 28 2012 4:35pm Subject: bzr push into mysql-5.6 branch (kevin.lewis:4197 to 4198) List-Archive: http://lists.mysql.com/commits/144646 Message-Id: <20120828163501.75119.97347.4198@kevin-lewis-macbook.local> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 4198 kevin.lewis@stripped 2012-08-28 Backport a change made to innodb-tablespace in mysql-trunk but not in mysql-5.6 which makes the query results into I_S.innodb_tablespaces more consistent and deterministic. modified: mysql-test/suite/innodb/r/innodb-tablespace.result mysql-test/suite/innodb/t/innodb-tablespace.test 4197 Tor Didriksen 2012-08-28 [merge] NULL merge 5.5 => 5.6 === modified file 'mysql-test/suite/innodb/r/innodb-tablespace.result' --- a/mysql-test/suite/innodb/r/innodb-tablespace.result revid:tor.didriksen@stripped +++ b/mysql-test/suite/innodb/r/innodb-tablespace.result revid:kevin.lewis@stripped @@ -100,12 +100,13 @@ FROM information_schema.innodb_sys_table name n_cols file_format row_format test/t1 5 Antelope Compact SELECT name,file_format,row_format -FROM information_schema.innodb_sys_tablespaces; +FROM information_schema.innodb_sys_tablespaces +ORDER BY name; name file_format row_format -mysql/innodb_table_stats Antelope Compact or Redundant mysql/innodb_index_stats Antelope Compact or Redundant -mysql/slave_relay_log_info Antelope Compact or Redundant +mysql/innodb_table_stats Antelope Compact or Redundant mysql/slave_master_info Antelope Compact or Redundant +mysql/slave_relay_log_info Antelope Compact or Redundant mysql/slave_worker_info Antelope Compact or Redundant test/t1 Antelope Compact or Redundant SELECT path FROM information_schema.innodb_sys_datafiles @@ -117,15 +118,17 @@ MYSQL_TMP_DIR/alt_dir/test/t1.ibd # DROP TABLE t1; SELECT name,n_cols,file_format,row_format -FROM information_schema.innodb_sys_tables WHERE name LIKE 'test%'; +FROM information_schema.innodb_sys_tables WHERE name LIKE 'test%' + ORDER BY name; name n_cols file_format row_format SELECT name,file_format,row_format -FROM information_schema.innodb_sys_tablespaces; +FROM information_schema.innodb_sys_tablespaces +ORDER BY name; name file_format row_format -mysql/innodb_table_stats Antelope Compact or Redundant mysql/innodb_index_stats Antelope Compact or Redundant -mysql/slave_relay_log_info Antelope Compact or Redundant +mysql/innodb_table_stats Antelope Compact or Redundant mysql/slave_master_info Antelope Compact or Redundant +mysql/slave_relay_log_info Antelope Compact or Redundant mysql/slave_worker_info Antelope Compact or Redundant SELECT path FROM information_schema.innodb_sys_datafiles WHERE path LIKE '%test%' ORDER BY space; @@ -146,16 +149,18 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQL_TMP_DIR/alt_dir/' SELECT name,n_cols,file_format,row_format -FROM information_schema.innodb_sys_tables WHERE name LIKE 'test%'; +FROM information_schema.innodb_sys_tables WHERE name LIKE 'test%' + ORDER BY name; name n_cols file_format row_format test/t1 5 Antelope Compact SELECT name,file_format,row_format -FROM information_schema.innodb_sys_tablespaces; +FROM information_schema.innodb_sys_tablespaces +ORDER BY name; name file_format row_format -mysql/innodb_table_stats Antelope Compact or Redundant mysql/innodb_index_stats Antelope Compact or Redundant -mysql/slave_relay_log_info Antelope Compact or Redundant +mysql/innodb_table_stats Antelope Compact or Redundant mysql/slave_master_info Antelope Compact or Redundant +mysql/slave_relay_log_info Antelope Compact or Redundant mysql/slave_worker_info Antelope Compact or Redundant test/t1 Antelope Compact or Redundant SELECT path FROM information_schema.innodb_sys_datafiles @@ -176,16 +181,18 @@ SELECT * FROM t1; a b 3 Truncate the table, then insert SELECT name,n_cols,file_format,row_format -FROM information_schema.innodb_sys_tables WHERE name LIKE 'test%'; +FROM information_schema.innodb_sys_tables WHERE name LIKE 'test%' + ORDER BY name; name n_cols file_format row_format test/t1 5 Antelope Compact SELECT name,file_format,row_format -FROM information_schema.innodb_sys_tablespaces; +FROM information_schema.innodb_sys_tablespaces +ORDER BY name; name file_format row_format -mysql/innodb_table_stats Antelope Compact or Redundant mysql/innodb_index_stats Antelope Compact or Redundant -mysql/slave_relay_log_info Antelope Compact or Redundant +mysql/innodb_table_stats Antelope Compact or Redundant mysql/slave_master_info Antelope Compact or Redundant +mysql/slave_relay_log_info Antelope Compact or Redundant mysql/slave_worker_info Antelope Compact or Redundant test/t1 Antelope Compact or Redundant SELECT path FROM information_schema.innodb_sys_datafiles @@ -207,16 +214,18 @@ a b 3 Truncate the table, then insert 4 Rename the table, then insert SELECT name,n_cols,file_format,row_format -FROM information_schema.innodb_sys_tables WHERE name LIKE 'test%'; +FROM information_schema.innodb_sys_tables WHERE name LIKE 'test%' + ORDER BY name; name n_cols file_format row_format test/t2 5 Antelope Compact SELECT name,file_format,row_format -FROM information_schema.innodb_sys_tablespaces; +FROM information_schema.innodb_sys_tablespaces +ORDER BY name; name file_format row_format -mysql/innodb_table_stats Antelope Compact or Redundant mysql/innodb_index_stats Antelope Compact or Redundant -mysql/slave_relay_log_info Antelope Compact or Redundant +mysql/innodb_table_stats Antelope Compact or Redundant mysql/slave_master_info Antelope Compact or Redundant +mysql/slave_relay_log_info Antelope Compact or Redundant mysql/slave_worker_info Antelope Compact or Redundant test/t2 Antelope Compact or Redundant SELECT path FROM information_schema.innodb_sys_datafiles @@ -237,17 +246,19 @@ SELECT * FROM t3; a b 5 CREATE TABLE LIKE SELECT name,n_cols,file_format,row_format -FROM information_schema.innodb_sys_tables WHERE name LIKE 'test%'; +FROM information_schema.innodb_sys_tables WHERE name LIKE 'test%' + ORDER BY name; name n_cols file_format row_format test/t2 5 Antelope Compact test/t3 5 Antelope Compact SELECT name,file_format,row_format -FROM information_schema.innodb_sys_tablespaces; +FROM information_schema.innodb_sys_tablespaces +ORDER BY name; name file_format row_format -mysql/innodb_table_stats Antelope Compact or Redundant mysql/innodb_index_stats Antelope Compact or Redundant -mysql/slave_relay_log_info Antelope Compact or Redundant +mysql/innodb_table_stats Antelope Compact or Redundant mysql/slave_master_info Antelope Compact or Redundant +mysql/slave_relay_log_info Antelope Compact or Redundant mysql/slave_worker_info Antelope Compact or Redundant test/t2 Antelope Compact or Redundant test/t3 Antelope Compact or Redundant @@ -266,15 +277,17 @@ t3.ibd # DROP TABLE t2, t3; SELECT name,n_cols,file_format,row_format -FROM information_schema.innodb_sys_tables WHERE name LIKE 'test%'; +FROM information_schema.innodb_sys_tables WHERE name LIKE 'test%' + ORDER BY name; name n_cols file_format row_format SELECT name,file_format,row_format -FROM information_schema.innodb_sys_tablespaces; +FROM information_schema.innodb_sys_tablespaces +ORDER BY name; name file_format row_format -mysql/innodb_table_stats Antelope Compact or Redundant mysql/innodb_index_stats Antelope Compact or Redundant -mysql/slave_relay_log_info Antelope Compact or Redundant +mysql/innodb_table_stats Antelope Compact or Redundant mysql/slave_master_info Antelope Compact or Redundant +mysql/slave_relay_log_info Antelope Compact or Redundant mysql/slave_worker_info Antelope Compact or Redundant SELECT path FROM information_schema.innodb_sys_datafiles WHERE path LIKE '%test%' ORDER BY space; === modified file 'mysql-test/suite/innodb/t/innodb-tablespace.test' --- a/mysql-test/suite/innodb/t/innodb-tablespace.test revid:tor.didriksen@stripped +++ b/mysql-test/suite/innodb/t/innodb-tablespace.test revid:kevin.lewis@stripped @@ -94,7 +94,8 @@ SHOW CREATE TABLE t1; SELECT name,n_cols,file_format,row_format FROM information_schema.innodb_sys_tables WHERE name LIKE 'test%'; SELECT name,file_format,row_format - FROM information_schema.innodb_sys_tablespaces; + FROM information_schema.innodb_sys_tablespaces + ORDER BY name; --replace_regex /emp#P#/emp#p#/ --replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR SELECT path FROM information_schema.innodb_sys_datafiles @@ -105,9 +106,11 @@ SELECT path FROM information_schema.inno --echo # DROP TABLE t1; SELECT name,n_cols,file_format,row_format - FROM information_schema.innodb_sys_tables WHERE name LIKE 'test%'; + FROM information_schema.innodb_sys_tables WHERE name LIKE 'test%' + ORDER BY name; SELECT name,file_format,row_format - FROM information_schema.innodb_sys_tablespaces; + FROM information_schema.innodb_sys_tablespaces + ORDER BY name; SELECT path FROM information_schema.innodb_sys_datafiles WHERE path LIKE '%test%' ORDER BY space; @@ -122,9 +125,11 @@ SELECT * FROM t1; --replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR SHOW CREATE TABLE t1; SELECT name,n_cols,file_format,row_format - FROM information_schema.innodb_sys_tables WHERE name LIKE 'test%'; + FROM information_schema.innodb_sys_tables WHERE name LIKE 'test%' + ORDER BY name; SELECT name,file_format,row_format - FROM information_schema.innodb_sys_tablespaces; + FROM information_schema.innodb_sys_tablespaces + ORDER BY name; --replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR SELECT path FROM information_schema.innodb_sys_datafiles WHERE path LIKE '%test%' ORDER BY space; @@ -140,9 +145,11 @@ TRUNCATE TABLE t1; INSERT INTO t1 VALUES (3, "Truncate the table, then insert"); SELECT * FROM t1; SELECT name,n_cols,file_format,row_format - FROM information_schema.innodb_sys_tables WHERE name LIKE 'test%'; + FROM information_schema.innodb_sys_tables WHERE name LIKE 'test%' + ORDER BY name; SELECT name,file_format,row_format - FROM information_schema.innodb_sys_tablespaces; + FROM information_schema.innodb_sys_tablespaces + ORDER BY name; --replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR SELECT path FROM information_schema.innodb_sys_datafiles WHERE path LIKE '%test%' ORDER BY space; @@ -158,9 +165,11 @@ RENAME TABLE t1 TO t2; INSERT INTO t2 VALUES (4, "Rename the table, then insert"); SELECT * FROM t2; SELECT name,n_cols,file_format,row_format - FROM information_schema.innodb_sys_tables WHERE name LIKE 'test%'; + FROM information_schema.innodb_sys_tables WHERE name LIKE 'test%' + ORDER BY name; SELECT name,file_format,row_format - FROM information_schema.innodb_sys_tablespaces; + FROM information_schema.innodb_sys_tablespaces + ORDER BY name; --replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR SELECT path FROM information_schema.innodb_sys_datafiles WHERE path LIKE '%test%' ORDER BY space; @@ -176,9 +185,11 @@ CREATE TABLE t3 LIKE t2; INSERT INTO t3 VALUES (5, "CREATE TABLE LIKE"); SELECT * FROM t3; SELECT name,n_cols,file_format,row_format - FROM information_schema.innodb_sys_tables WHERE name LIKE 'test%'; + FROM information_schema.innodb_sys_tables WHERE name LIKE 'test%' + ORDER BY name; SELECT name,file_format,row_format - FROM information_schema.innodb_sys_tablespaces; + FROM information_schema.innodb_sys_tablespaces + ORDER BY name; --replace_result ./ MYSQLD_DATADIR/ $MYSQLD_DATADIR MYSQLD_DATADIR $MYSQL_TMP_DIR MYSQL_TMP_DIR SELECT path FROM information_schema.innodb_sys_datafiles WHERE path LIKE '%test%' ORDER BY space; @@ -190,9 +201,11 @@ SELECT path FROM information_schema.inno --echo # DROP TABLE t2, t3; SELECT name,n_cols,file_format,row_format - FROM information_schema.innodb_sys_tables WHERE name LIKE 'test%'; + FROM information_schema.innodb_sys_tables WHERE name LIKE 'test%' + ORDER BY name; SELECT name,file_format,row_format - FROM information_schema.innodb_sys_tablespaces; + FROM information_schema.innodb_sys_tablespaces + ORDER BY name; SELECT path FROM information_schema.innodb_sys_datafiles WHERE path LIKE '%test%' ORDER BY space; --echo ---- MYSQLD_DATADIR/test No bundle (reason: useless for push emails).