innodb suite bug11766634, autoinc_reset

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

@@ -2,10 +2,10 @@ CREATE TABLE t1 (
 id    INT AUTO_INCREMENT PRIMARY KEY,
 name  VARCHAR(100)
 ) ENGINE=InnoDB AUTO_INCREMENT=99;
-SET GLOBAL debug="+d,innodb_evict_autoinc_table";
+SET  @@debug_dbug="+d,innodb_evict_autoinc_table";
 SET GLOBAL innodb_ft_aux_table="test/t1";
 ERROR 42000: Variable 'innodb_ft_aux_table' can't be set to the value of 'test/t1'
-SET GLOBAL debug="-d,innodb_evict_autoinc_table";
+SET  @@debug_dbug="-d,innodb_evict_autoinc_table";
 INSERT INTO t1(name) VALUES('mysql');
 SELECT * FROM t1;
 id	name

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

@@ -8,14 +8,14 @@ insert into t3 values (20);
 alter table t2 add constraint c1 foreign key (f1)
 references t1(f1) on update cascade;
 show create table t1;
-Table Create Table
-t1  CREATE TABLE `t1` (
+Table	Create Table
+t1	CREATE TABLE `t1` (
   `f1` int(11) DEFAULT NULL,
   KEY `k1` (`f1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 show create table t2;
-Table Create Table
-t2  CREATE TABLE `t2` (
+Table	Create Table
+t2	CREATE TABLE `t2` (
   `f1` int(11) DEFAULT NULL,
   `f2` int(11) DEFAULT NULL,
   KEY `f1` (`f1`),
@@ -23,8 +23,8 @@ t2  CREATE TABLE `t2` (
   CONSTRAINT `c1` FOREIGN KEY (`f1`) REFERENCES `t1` (`f1`) ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 show create table t3;
-Table Create Table
-t3  CREATE TABLE `t3` (
+Table	Create Table
+t3	CREATE TABLE `t3` (
   `f2` int(11) DEFAULT NULL,
   KEY `f2` (`f2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1

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

@@ -21,7 +21,7 @@ call mtr.add_suppression("InnoDB: The log sequence numbers [0-9]+ and [0-9]+ in
 
 CREATE TABLE t1(a INT PRIMARY KEY) ENGINE=InnoDB;
 
-SET DEBUG='+d,crash_commit_before';
+SET debug_dbug='+d,crash_commit_before';
 # Write file to make mysql-test-run.pl restart the server
 --exec echo "restart: --innodb-log-file-size=6M" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
 --error 2013
@@ -35,7 +35,7 @@ SELECT * FROM t1;
 
 INSERT INTO t1 VALUES (42);
 
-SET DEBUG='+d,crash_commit_before';
+SET debug_dbug='+d,crash_commit_before';
 # Write file to make mysql-test-run.pl restart the server
 --exec echo "restart: --innodb-log-files-in-group=3 --innodb-log-file-size=5M" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
 --error 2013
@@ -54,7 +54,7 @@ let SEARCH_FILE= $MYSQLTEST_VARDIR/log/my_restart.err;
 let $args=--loose-console --default-storage-engine=innodb > $SEARCH_FILE 2>&1;
 let crash=$args --innodb-force-recovery-crash;
 
-SET DEBUG='+d,crash_commit_before';
+SET debug_dbug='+d,crash_commit_before';
 # Write file to make mysql-test-run.pl restart the server
 --exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
 --error 2013
@@ -97,6 +97,8 @@ let SEARCH_PATTERN= InnoDB: Recovery skipped, --innodb-read-only set!;
 --source include/search_pattern_in_file.inc
 let SEARCH_PATTERN= InnoDB: Can.t initiate database recovery, running in read-only-mode;
 --source include/search_pattern_in_file.inc
+
+--exec cat $SEARCH_FILE
 --remove_file $SEARCH_FILE
 
 --echo --innodb-force-recovery-crash=4
@@ -106,7 +108,10 @@ let SEARCH_PATTERN= InnoDB: Starting an apply batch of log records;
 --source include/search_pattern_in_file.inc
 let SEARCH_PATTERN= InnoDB: Resizing redo log from 3\*[0-9]+ to 2\*[0-9]+ pages;
 --source include/search_pattern_in_file.inc
+
+--exec cat $SEARCH_FILE
 --remove_file $SEARCH_FILE
+
 --echo --innodb-force-recovery-crash=5
 --error 7
 --exec $MYSQLD_CMD $crash=5

mysql-test/suite/innodb/t/innodb_autoinc_reset.test

@@ -10,13 +10,13 @@ CREATE TABLE t1 (
   name  VARCHAR(100)
 ) ENGINE=InnoDB AUTO_INCREMENT=99;
 
-SET GLOBAL debug="+d,innodb_evict_autoinc_table";
+SET  @@debug_dbug="+d,innodb_evict_autoinc_table";
 
 # Evict t1 from dictionary cache
 -- error ER_WRONG_VALUE_FOR_VAR
 SET GLOBAL innodb_ft_aux_table="test/t1";
 
-SET GLOBAL debug="-d,innodb_evict_autoinc_table";
+SET  @@debug_dbug="-d,innodb_evict_autoinc_table";
 
 INSERT INTO t1(name) VALUES('mysql');
 

mysql-test/suite/innodb/t/innodb_bug11766634-master.opt

---force-restart

mysql-test/suite/innodb/t/innodb_bug11766634.test

@@ -6,7 +6,7 @@
 # drop table t1.  create table t1.  Insert the same set of $recs
 # records.  The size of ibdata1 must not increase.
 #
-
+-- source include/restart_and_reinit.inc
 #Want to skip this test from daily Valgrind execution.
 --source include/no_valgrind_without_big.inc
 # Adding big test option for this test.

mysql-test/suite/innodb/t/innodb_bug70867.test

@@ -19,7 +19,7 @@
 #
 let $MYSQL_DATA_DIR = `select @@datadir`;
 let SEARCH_FILE = $MYSQLTEST_VARDIR/log/my_restart.err;
-let $args = --loose-console > $SEARCH_FILE 2>&1;
+let $args=--loose-console --default-storage-engine=innodb > $SEARCH_FILE 2>&1;
 
 #-----------------------------------------------------------------------------
 use test;
@@ -31,11 +31,12 @@ use test;
 --mkdir $MYSQL_DATA_DIR/tmpdata
 --chmod 0400 $MYSQL_DATA_DIR/tmpdata
 --error 1
---exec $MYSQLD_CMD --innodb_data_home_dir=$MYSQL_DATA_DIR/tmpdata $args
+--exec $MYSQLD_CMD $args --innodb_data_home_dir=$MYSQL_DATA_DIR/tmpdata 
 let SEARCH_PATTERN = returned OS error 113;
---source ./include/search_pattern.inc
+--source include/search_pattern_in_file.inc
 let SEARCH_PATTERN = The error means mysqld does not have the access rights to;
---source ./include/search_pattern.inc
+--source include/search_pattern_in_file.inc
+#--exec cat $SEARCH_FILE
 #
 --remove_file $SEARCH_FILE
 --chmod 0777 $MYSQL_DATA_DIR/tmpdata