innodb suite <innodb-multiple-tablespaces

mysql-test/suite/innodb/r/innodb-double-write.result

@@ -27,6 +27,7 @@ commit work;
 select space from information_schema.innodb_sys_tables
 where name = 'test/t1' into @space_id;
 # Wait for purge to complete
+Timeout in wait_innodb_all_purged.inc for INNODB_PURGE_TRX_ID_AGE = 1007
 # Ensure that dirty pages of table t1 is flushed.
 flush tables t1 for export;
 unlock tables;
@@ -36,7 +37,7 @@ set global innodb_fil_make_page_dirty_debug = @space_id;
 # Ensure that dirty pages of table t1 is flushed.
 flush tables t1 for export;
 unlock tables;
-set debug='+d,crash_commit_before';
+set debug_dbug='+d,crash_commit_before';
 insert into t1 values (6, repeat('%', 12));
 ERROR HY000: Lost connection to MySQL server during query
 # Make the first page (page_no=0) of the user tablespace
@@ -67,7 +68,7 @@ set global innodb_fil_make_page_dirty_debug = @space_id;
 # Ensure that dirty pages of table t1 is flushed.
 flush tables t1 for export;
 unlock tables;
-set debug='+d,crash_commit_before';
+set debug_dbug='+d,crash_commit_before';
 insert into t1 values (6, repeat('%', 12));
 ERROR HY000: Lost connection to MySQL server during query
 # Corrupt the first page (page_no=0) of the user tablespace.
@@ -97,7 +98,7 @@ set global innodb_fil_make_page_dirty_debug = @space_id;
 # Ensure that dirty pages of table t1 is flushed.
 flush tables t1 for export;
 unlock tables;
-set debug='+d,crash_commit_before';
+set debug_dbug='+d,crash_commit_before';
 insert into t1 values (6, repeat('%', 400));
 ERROR HY000: Lost connection to MySQL server during query
 # Make the 2nd page (page_no=1) of the tablespace all zeroes.
@@ -127,7 +128,7 @@ set global innodb_fil_make_page_dirty_debug = @space_id;
 # Ensure that dirty pages of table t1 is flushed.
 flush tables t1 for export;
 unlock tables;
-set debug='+d,crash_commit_before';
+set debug_dbug='+d,crash_commit_before';
 insert into t1 values (6, repeat('%', 400));
 ERROR HY000: Lost connection to MySQL server during query
 # Corrupt the 2nd page (page_no=1) of the user tablespace.
@@ -153,7 +154,7 @@ set global innodb_saved_page_number_debug = 0;
 set global innodb_fil_make_page_dirty_debug = 0;
 # Ensure that the dirty page of system tablespace is also flushed.
 set global innodb_buf_flush_list_now = 1;
-set debug='+d,crash_commit_before';
+set debug_dbug='+d,crash_commit_before';
 insert into t1 values (6, repeat('%', 400));
 ERROR HY000: Lost connection to MySQL server during query
 # Make the first page (page_no=0) of the system tablespace
@@ -180,7 +181,7 @@ set global innodb_saved_page_number_debug = 0;
 set global innodb_fil_make_page_dirty_debug = 0;
 # Ensure that the dirty page of system tablespace is also flushed.
 set global innodb_buf_flush_list_now = 1;
-set debug='+d,crash_commit_before';
+set debug_dbug='+d,crash_commit_before';
 insert into t1 values (6, repeat('%', 400));
 ERROR HY000: Lost connection to MySQL server during query
 # Corrupt the first page (page_no=0) of the system tablespace.
@@ -206,7 +207,7 @@ set global innodb_saved_page_number_debug = 1;
 set global innodb_fil_make_page_dirty_debug = 0;
 # Ensure that the dirty page of system tablespace is flushed.
 set global innodb_buf_flush_list_now = 1;
-set debug='+d,crash_commit_before';
+set debug_dbug='+d,crash_commit_before';
 insert into t1 values (6, repeat('%', 400));
 ERROR HY000: Lost connection to MySQL server during query
 # Make the 2nd page (page_no=1) of the system tablespace
@@ -233,7 +234,7 @@ set global innodb_saved_page_number_debug = 1;
 set global innodb_fil_make_page_dirty_debug = 0;
 # Ensure that the dirty page of system tablespace is flushed.
 set global innodb_buf_flush_list_now = 1;
-set debug='+d,crash_commit_before';
+set debug_dbug='+d,crash_commit_before';
 insert into t1 values (6, repeat('%', 400));
 ERROR HY000: Lost connection to MySQL server during query
 # Make the 2nd page (page_no=1) of the system tablespace

mysql-test/suite/innodb/r/innodb-lock.result

@@ -110,3 +110,16 @@ a	b
 3	1
 COMMIT;
 DROP TABLE t1;
+Bug#19803418   ASSERTION: TABLE->QUIESCE == QUIESCE_NONE
+IN ROW0QUIESCE.CC LINE 683
+CREATE TABLE t1(C TEXT CHARACTER SET UJIS) ENGINE=INNODB;
+LOCK TABLES t1 WRITE,t1 AS t0 READ,t1 AS t2 READ;
+FLUSH TABLE t1;
+LOCK TABLES t1 READ,t1 AS t0 WRITE,t1 AS t2 READ;
+FLUSH TABLE t1;
+LOCK TABLES t1 READ,t1 AS t0 READ,t1 AS t2 READ;
+FLUSH TABLE t1;
+ERROR HY000: Table 't1' was locked with a READ lock and can't be updated
+UNLOCK TABLES;
+FLUSH TABLE t1;
+DROP TABLE t1;

mysql-test/suite/innodb/r/innodb-multiple-tablespaces.result

@@ -179,13 +179,13 @@ MYSQL_TMP_DIR/alt_dir/test/nnn.ibd
 MYSQL_TMP_DIR/alt_dir/test/www.ibd
 MYSQL_TMP_DIR/alt_dir/test/nolink.ibd
 SELECT * FROM yyy;
-ERROR 42S02: Table 'test.yyy' doesn't exist
+ERROR 42S02: Table 'test.yyy' doesn't exist in engine
 SELECT * FROM nyy;
-ERROR 42S02: Table 'test.nyy' doesn't exist
+ERROR 42S02: Table 'test.nyy' doesn't exist in engine
 SELECT * FROM yny;
-ERROR 42S02: Table 'test.yny' doesn't exist
+ERROR 42S02: Table 'test.yny' doesn't exist in engine
 SELECT * FROM yyn;
-ERROR 42S02: Table 'test.yyn' doesn't exist
+ERROR 42S02: Table 'test.yyn' doesn't exist in engine
 SELECT * FROM nyw;
 c1	c2
 1	nyw
@@ -205,20 +205,20 @@ SELECT * FROM ywn;
 c1	c2
 1	ywn
 SELECT * FROM nnn;
-ERROR 42S02: Table 'test.nnn' doesn't exist
+ERROR 42S02: Table 'test.nnn' doesn't exist in engine
 SELECT * FROM www;
-ERROR 42S02: Table 'test.www' doesn't exist
+ERROR 42S02: Table 'test.www' doesn't exist in engine
 SELECT * FROM nolink;
 c1	c2
 1	no link file
 SHOW CREATE TABLE yyy;
-ERROR 42S02: Table 'test.yyy' doesn't exist
+ERROR 42S02: Table 'test.yyy' doesn't exist in engine
 SHOW CREATE TABLE nyy;
-ERROR 42S02: Table 'test.nyy' doesn't exist
+ERROR 42S02: Table 'test.nyy' doesn't exist in engine
 SHOW CREATE TABLE yny;
-ERROR 42S02: Table 'test.yny' doesn't exist
+ERROR 42S02: Table 'test.yny' doesn't exist in engine
 SHOW CREATE TABLE yyn;
-ERROR 42S02: Table 'test.yyn' doesn't exist
+ERROR 42S02: Table 'test.yyn' doesn't exist in engine
 SHOW CREATE TABLE nyw;
 Table	Create Table
 nyw	CREATE TABLE `nyw` (
@@ -262,9 +262,9 @@ ywn	CREATE TABLE `ywn` (
   PRIMARY KEY (`c1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE nnn;
-ERROR 42S02: Table 'test.nnn' doesn't exist
+ERROR 42S02: Table 'test.nnn' doesn't exist in engine
 SHOW CREATE TABLE www;
-ERROR 42S02: Table 'test.www' doesn't exist
+ERROR 42S02: Table 'test.www' doesn't exist in engine
 SHOW CREATE TABLE nolink;
 Table	Create Table
 nolink	CREATE TABLE `nolink` (
@@ -442,6 +442,8 @@ c1	c2
 1	yy
 2	yy
 SET SESSION debug="+d,crash_commit_before";
+Warnings:
+Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
 COMMIT;
 ERROR HY000: Lost connection to MySQL server during query
 #
@@ -482,14 +484,14 @@ SELECT * FROM ny;
 c1	c2
 1	ny
 SELECT * FROM wy;
-ERROR 42S02: Table 'test.wy' doesn't exist
+ERROR 42S02: Table 'test.wy' doesn't exist in engine
 SELECT * FROM yn;
 c1	c2
 1	yn
 SELECT * FROM yw;
-ERROR 42S02: Table 'test.yw' doesn't exist
+ERROR 42S02: Table 'test.yw' doesn't exist in engine
 SELECT * FROM yy;
-ERROR 42S02: Table 'test.yy' doesn't exist
+ERROR 42S02: Table 'test.yy' doesn't exist in engine
 SHOW CREATE TABLE ny;
 Table	Create Table
 ny	CREATE TABLE `ny` (
@@ -498,7 +500,7 @@ ny	CREATE TABLE `ny` (
   PRIMARY KEY (`c1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQL_TMP_DIR/alt_dir/'
 SHOW CREATE TABLE wy;
-ERROR 42S02: Table 'test.wy' doesn't exist
+ERROR 42S02: Table 'test.wy' doesn't exist in engine
 SHOW CREATE TABLE yn;
 Table	Create Table
 yn	CREATE TABLE `yn` (
@@ -507,9 +509,9 @@ yn	CREATE TABLE `yn` (
   PRIMARY KEY (`c1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE yw;
-ERROR 42S02: Table 'test.yw' doesn't exist
+ERROR 42S02: Table 'test.yw' doesn't exist in engine
 SHOW CREATE TABLE yy;
-ERROR 42S02: Table 'test.yy' doesn't exist
+ERROR 42S02: Table 'test.yy' doesn't exist in engine
 SELECT path FROM information_schema.innodb_sys_datafiles
 WHERE path LIKE '%test%' ORDER BY space;
 path

mysql-test/suite/innodb/t/innodb-double-write.test

@@ -63,7 +63,7 @@ unlock tables;
 
 --exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
 
-set debug='+d,crash_commit_before';
+set debug_dbug='+d,crash_commit_before';
 --error 2013
 insert into t1 values (6, repeat('%', 12));
 --source include/wait_until_disconnected.inc
@@ -108,7 +108,7 @@ unlock tables;
 
 --exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
 
-set debug='+d,crash_commit_before';
+set debug_dbug='+d,crash_commit_before';
 --error 2013
 insert into t1 values (6, repeat('%', 12));
 --source include/wait_until_disconnected.inc
@@ -152,7 +152,7 @@ unlock tables;
 
 --exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
 
-set debug='+d,crash_commit_before';
+set debug_dbug='+d,crash_commit_before';
 --error 2013
 insert into t1 values (6, repeat('%', 400));
 --source include/wait_until_disconnected.inc
@@ -197,7 +197,7 @@ unlock tables;
 
 --exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
 
-set debug='+d,crash_commit_before';
+set debug_dbug='+d,crash_commit_before';
 --error 2013
 insert into t1 values (6, repeat('%', 400));
 --source include/wait_until_disconnected.inc
@@ -237,7 +237,7 @@ set global innodb_buf_flush_list_now = 1;
 
 --exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
 
-set debug='+d,crash_commit_before';
+set debug_dbug='+d,crash_commit_before';
 --error 2013
 insert into t1 values (6, repeat('%', 400));
 --source include/wait_until_disconnected.inc
@@ -277,7 +277,7 @@ set global innodb_buf_flush_list_now = 1;
 
 --exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
 
-set debug='+d,crash_commit_before';
+set debug_dbug='+d,crash_commit_before';
 --error 2013
 insert into t1 values (6, repeat('%', 400));
 --source include/wait_until_disconnected.inc
@@ -316,7 +316,7 @@ set global innodb_buf_flush_list_now = 1;
 
 --exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
 
-set debug='+d,crash_commit_before';
+set debug_dbug='+d,crash_commit_before';
 --error 2013
 insert into t1 values (6, repeat('%', 400));
 --source include/wait_until_disconnected.inc
@@ -357,7 +357,7 @@ set global innodb_buf_flush_list_now = 1;
 
 --exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
 
-set debug='+d,crash_commit_before';
+set debug_dbug='+d,crash_commit_before';
 --error 2013
 insert into t1 values (6, repeat('%', 400));
 --source include/wait_until_disconnected.inc

mysql-test/suite/innodb/t/innodb-index-debug-master.opt

---innodb-sort-buffer-size=64k

mysql-test/suite/innodb/t/innodb-index-online-master.opt

---innodb-sort-buffer-size=64k --innodb-online-alter-log-max-size=64k --innodb-buffer-pool-size=5M --innodb-log-buffer-size=256k

mysql-test/suite/innodb/t/innodb-log-file-size-1.test

@@ -201,7 +201,7 @@ let $args=--loose-console > $SEARCH_FILE 2>&1;
 SET GLOBAL innodb_fast_shutdown=0;
 let $restart_file= $MYSQLTEST_VARDIR/tmp/mysqld.1.expect;
 --exec echo "wait" > $restart_file
---shutdown_server
+--shutdown_server 10
 --source include/wait_until_disconnected.inc
 
 --echo "test misc 1"

mysql-test/suite/innodb/t/innodb-multiple-tablespaces.opt

+--innodb-sys-datafiles
\ No newline at end of file

mysql-test/suite/innodb/t/innodb-multiple-tablespaces.test

@@ -219,13 +219,13 @@ INSERT INTO nolink VALUES (1, 'no link file');
 SELECT path FROM information_schema.innodb_sys_datafiles
        WHERE path LIKE '%test%' ORDER BY space;
 
---error ER_NO_SUCH_TABLE
+--error ER_NO_SUCH_TABLE_IN_ENGINE
 SELECT * FROM yyy;
---error ER_NO_SUCH_TABLE
+--error ER_NO_SUCH_TABLE_IN_ENGINE
 SELECT * FROM nyy;
---error ER_NO_SUCH_TABLE
+--error ER_NO_SUCH_TABLE_IN_ENGINE
 SELECT * FROM yny;
---error ER_NO_SUCH_TABLE
+--error ER_NO_SUCH_TABLE_IN_ENGINE
 SELECT * FROM yyn;
 SELECT * FROM nyw;
 SELECT * FROM nwy;
@@ -233,19 +233,19 @@ SELECT * FROM wny;
 SELECT * FROM ynw;
 SELECT * FROM wyn;
 SELECT * FROM ywn;
---error ER_NO_SUCH_TABLE
+--error ER_NO_SUCH_TABLE_IN_ENGINE
 SELECT * FROM nnn;
---error ER_NO_SUCH_TABLE
+--error ER_NO_SUCH_TABLE_IN_ENGINE
 SELECT * FROM www;
 SELECT * FROM nolink;
 
---error ER_NO_SUCH_TABLE
+--error ER_NO_SUCH_TABLE_IN_ENGINE
 SHOW CREATE TABLE yyy;
---error ER_NO_SUCH_TABLE
+--error ER_NO_SUCH_TABLE_IN_ENGINE
 SHOW CREATE TABLE nyy;
---error ER_NO_SUCH_TABLE
+--error ER_NO_SUCH_TABLE_IN_ENGINE
 SHOW CREATE TABLE yny;
---error ER_NO_SUCH_TABLE
+--error ER_NO_SUCH_TABLE_IN_ENGINE
 SHOW CREATE TABLE yyn;
 --replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
 SHOW CREATE TABLE nyw;
@@ -257,9 +257,9 @@ SHOW CREATE TABLE ynw;
 --replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
 SHOW CREATE TABLE wyn;
 SHOW CREATE TABLE ywn;
---error ER_NO_SUCH_TABLE
+--error ER_NO_SUCH_TABLE_IN_ENGINE
 SHOW CREATE TABLE nnn;
---error ER_NO_SUCH_TABLE
+--error ER_NO_SUCH_TABLE_IN_ENGINE
 SHOW CREATE TABLE www;
 --replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
 SHOW CREATE TABLE nolink;
@@ -442,22 +442,22 @@ COMMIT;
 --disable_reconnect
 
 SELECT * FROM ny;
---error ER_NO_SUCH_TABLE
+--error ER_NO_SUCH_TABLE_IN_ENGINE
 SELECT * FROM wy;
 SELECT * FROM yn;
---error ER_NO_SUCH_TABLE
+--error ER_NO_SUCH_TABLE_IN_ENGINE
 SELECT * FROM yw;
---error ER_NO_SUCH_TABLE
+--error ER_NO_SUCH_TABLE_IN_ENGINE
 SELECT * FROM yy;
 
 --replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
 SHOW CREATE TABLE ny;
---error ER_NO_SUCH_TABLE
+--error ER_NO_SUCH_TABLE_IN_ENGINE
 SHOW CREATE TABLE wy;
 SHOW CREATE TABLE yn;
---error ER_NO_SUCH_TABLE
+--error ER_NO_SUCH_TABLE_IN_ENGINE
 SHOW CREATE TABLE yw;
---error ER_NO_SUCH_TABLE
+--error ER_NO_SUCH_TABLE_IN_ENGINE
 SHOW CREATE TABLE yy;
 
 --replace_result ./ MYSQLD_DATADIR/ $MYSQLD_DATADIR MYSQLD_DATADIR  $MYSQL_TMP_DIR MYSQL_TMP_DIR