WL#6735 Migrate sys_vars MTR test suite to run with innodb storage engine

Author: Akhila Maddukuri

mysql-test/suite/sys_vars/r/character_set_database_func.result

@@ -35,7 +35,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(40) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+) ENGINE=InnoDB DEFAULT CHARSET=utf8
 DROP TABLE t1;
 DROP DATABASE db1;
 '--ascii character set specified--'
@@ -50,7 +50,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(40) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=ascii
+) ENGINE=InnoDB DEFAULT CHARSET=ascii
 DROP TABLE t1;
 DROP DATABASE db1;
 '------Check if load data uses character_set_database----------'

mysql-test/suite/sys_vars/r/collation_database_func.result

@@ -35,15 +35,15 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` char(20) COLLATE utf8_roman_ci DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_roman_ci
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_roman_ci
 '---check if updating collation_database effects new table/column---'
 SET @@session.collation_database = latin7_general_cs;
 CREATE TABLE t2(a CHAR(10));
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `a` char(10) COLLATE utf8_roman_ci DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_roman_ci
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_roman_ci
 DROP TABLE t1,t2;
 '--check value of collation and character set when current db is dropped'
 DROP DATABASE db1;
@@ -84,9 +84,6 @@ MX Systems
 '----check if indexing is effected by collation_database---'
 SET @@session.collation_database = latin1_swedish_ci;
 ALTER TABLE t1 ADD PRIMARY KEY (a);
-REPAIR TABLE t1;
-Table	Op	Msg_type	Msg_text
-test.t1	repair	status	OK
 SELECT * FROM t1 ORDER BY a;
 a
 Muffler
@@ -95,9 +92,6 @@ M
 ALTER TABLE t1 DROP PRIMARY KEY;
 SET @@session.collation_database = latin1_german1_ci;
 ALTER TABLE t1 ADD PRIMARY KEY (a);
-REPAIR TABLE t1;
-Table	Op	Msg_type	Msg_text
-test.t1	repair	status	OK
 SELECT * FROM t1 ORDER BY a;
 a
 Muffler

mysql-test/suite/sys_vars/r/collation_server_func.result

@@ -30,15 +30,15 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` char(20) COLLATE latin1_german1_ci DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_german1_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_german1_ci
 '---check if updating collation_server effects new table/column---'
 SET @@session.collation_server = latin1_swedish_ci;
 CREATE TABLE t2(a CHAR(10));
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `a` char(10) COLLATE latin1_german1_ci DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_german1_ci
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_german1_ci
 INSERT INTO t1 VALUES('Muffler'),('M�ller'),('MX Systems');
 '---check if collation_server effects results sort order---'
 SET @@session.collation_server = latin1_swedish_ci;
@@ -66,9 +66,6 @@ MX Systems
 '---check if indexing is effected by collation_server---'
 SET @@session.collation_server = latin1_swedish_ci;
 ALTER TABLE t1 ADD PRIMARY KEY (a);
-REPAIR TABLE t1;
-Table	Op	Msg_type	Msg_text
-db1.t1	repair	status	OK
 SELECT * FROM t1 ORDER BY a;
 a
 Muffler
@@ -77,9 +74,6 @@ MX Systems
 ALTER TABLE t1 DROP PRIMARY KEY;
 SET @@session.collation_server = latin1_german1_ci;
 ALTER TABLE t1 ADD PRIMARY KEY (a);
-REPAIR TABLE t1;
-Table	Op	Msg_type	Msg_text
-db1.t1	repair	status	OK
 SELECT * FROM t1 ORDER BY a;
 a
 Muffler

mysql-test/suite/sys_vars/r/insert_id_func.result

@@ -16,7 +16,7 @@ SELECT @@session.insert_id;
 INSERT into t1(name) values('Record_1');
 INSERT into t1(name) values('Record_2');
 ## Verifying rows in table ##
-SELECT * from t1;
+SELECT * from t1 order by name;
 id	name
 100	Record_1
 101	Record_2
@@ -35,7 +35,7 @@ SELECT @@session.insert_id;
 INSERT into t1(name) values('Record_4');
 INSERT into t1(name) values('Record_5');
 INSERT into t1(name) values('Record_6');
-SELECT * from t1;
+SELECT * from t1 order by name;
 id	name
 100	Record_1
 101	Record_2
@@ -53,7 +53,7 @@ SET @@session.insert_id = 25;
 INSERT into t1(name) values('Record_7');
 INSERT into t1(name) values('Record_8');
 ## Verifying data in table t1 ##
-SELECT * from t1;
+SELECT * from t1 order by name;
 id	name
 100	Record_1
 101	Record_2

mysql-test/suite/sys_vars/r/max_seeks_for_key_func.result

@@ -18,8 +18,8 @@ SELECT @@global.max_seeks_for_key;
 INSERT INTO t1(b) VALUES("AREc");
 EXPLAIN SELECT STRAIGHT_JOIN * FROM t1,t1 AS t2 WHERE t1.b = t2.b;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	system	NULL	NULL	NULL	NULL	1	NULL
-1	SIMPLE	t2	system	NULL	NULL	NULL	NULL	1	NULL
+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	1	NULL
+1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	1	Using where; Using join buffer (Block Nested Loop)
 SET @@session.max_seeks_for_key = 2;
 SELECT @@session.max_seeks_for_key;
 @@session.max_seeks_for_key

mysql-test/suite/sys_vars/r/sql_quote_show_create_func.result

@@ -13,7 +13,7 @@ Table	Create Table
 t1	CREATE TEMPORARY TABLE `t1` (
   `a` varchar(20) DEFAULT NULL,
   `b` varchar(20) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
 EXPECTING identifiers a, b, t1 TO BE quoted like 'a','b','t1'
 '#-----------------------------FN_DYNVARS_163_02------------------------------------#'
 SET SESSION sql_quote_show_create = FALSE;
@@ -26,7 +26,7 @@ Table	Create Table
 t1	CREATE TEMPORARY TABLE t1 (
   a varchar(20) DEFAULT NULL,
   b varchar(20) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
 EXPECTING identifiers a, b, t1 NOT TO BE quoted like 'a','b','t1'
 '#----------------------------FN_DYNVARS_163_03--------------------------------------#'
 ** Connecting con_int1 using root **

mysql-test/suite/sys_vars/t/auto_increment_increment_func.test

@@ -18,7 +18,7 @@
 #  server-system-variables.html#option_mysqld_auto-increment-increment         #
 #                                                                              #
 ################################################################################
-
+--source include/have_myisam.inc
 # save vars
 SET @global_auto_increment_increment = @@global.auto_increment_increment;
 SET @session_auto_increment_increment = @@session.auto_increment_increment;

mysql-test/suite/sys_vars/t/auto_increment_offset_func.test

@@ -18,7 +18,7 @@
 #  server-system-variables.html#option_mysqld_auto-increment-offset            #
 #                                                                              #
 ################################################################################
-
+--source include/have_myisam.inc
 # save vars
 SET @global_auto_increment_increment = @@global.auto_increment_increment;
 SET @session_auto_increment_increment = @@session.auto_increment_increment;

mysql-test/suite/sys_vars/t/collation_database_func.test

@@ -115,13 +115,11 @@ SELECT * FROM t1 ORDER BY a COLLATE latin1_german1_ci;
 #==============================================================================
 SET @@session.collation_database = latin1_swedish_ci;
 ALTER TABLE t1 ADD PRIMARY KEY (a);
-REPAIR TABLE t1;
 SELECT * FROM t1 ORDER BY a;
 
 ALTER TABLE t1 DROP PRIMARY KEY;
 SET @@session.collation_database = latin1_german1_ci;
 ALTER TABLE t1 ADD PRIMARY KEY (a);
-REPAIR TABLE t1;
 SELECT * FROM t1 ORDER BY a;
 
 # clean up

mysql-test/suite/sys_vars/t/collation_server_func.test

@@ -94,13 +94,11 @@ SELECT * FROM t1 ORDER BY a COLLATE latin1_german1_ci;
 #==============================================================================
 SET @@session.collation_server = latin1_swedish_ci;
 ALTER TABLE t1 ADD PRIMARY KEY (a);
-REPAIR TABLE t1;
 SELECT * FROM t1 ORDER BY a;
 
 ALTER TABLE t1 DROP PRIMARY KEY;
 SET @@session.collation_server = latin1_german1_ci;
 ALTER TABLE t1 ADD PRIMARY KEY (a);
-REPAIR TABLE t1;
 SELECT * FROM t1 ORDER BY a;
 
 

mysql-test/suite/sys_vars/t/concurrent_insert_func.test

@@ -23,7 +23,7 @@
 #    http://dev.mysql.com/doc/refman/5.1/en/server-system-variables.html       #
 #                                                                              #
 ################################################################################
-
+--source include/have_myisam.inc
 --source include/not_embedded.inc
 
 --disable_warnings

mysql-test/suite/sys_vars/t/delay_key_write_func.test

@@ -18,6 +18,7 @@
 #  http://dev.mysql.com/doc/refman/5.1/en/server-system-variables.html        #
 #                                                                             #
 ###############################################################################
+--source include/have_myisam.inc
 
 --echo '#--------------------FN_DYNVARS_023_01-------------------------#'
 #######################################################################

mysql-test/suite/sys_vars/t/ft_boolean_syntax_func.test

@@ -18,6 +18,7 @@
 #  server-system-variables.html                                               #
 #                                                                             #
 ###############################################################################
+--source include/have_myisam.inc
 --echo '#--------------------FN_DYNVARS_033_01-------------------------#'
 ###################################################################
 # Check if setting ft_boolean_syntax is changed in new connection # 
@@ -56,7 +57,7 @@ CREATE TABLE articles (
    title VARCHAR(200),
    body TEXT,
    FULLTEXT (title,body)
-);
+)ENGINE=MyISAM;
 
 INSERT INTO articles (title,body) VALUES
 ('MySQL Tutorial','DBMS stands for DataBase ...'),
@@ -88,6 +89,7 @@ AGAINST ('+security configuring' IN BOOLEAN MODE)) AS relevance
 FROM articles WHERE MATCH (title,body) 
 AGAINST ('+security configuring' IN BOOLEAN MODE);
 
+
 SELECT * FROM articles WHERE MATCH (title,body)
 AGAINST ('"faster than"' IN BOOLEAN MODE);
 

mysql-test/suite/sys_vars/t/insert_id_func.test

@@ -50,7 +50,7 @@ INSERT into t1(name) values('Record_1');
 INSERT into t1(name) values('Record_2');	
 
 --echo ## Verifying rows in table ##
-SELECT * from t1;
+SELECT * from t1 order by name;
 SELECT @@session.insert_id;
 
 INSERT into t1(name) values('Record_3');
@@ -75,7 +75,7 @@ INSERT into t1(name) values('Record_4');
 INSERT into t1(name) values('Record_5');	
 INSERT into t1(name) values('Record_6');
 
-SELECT * from t1;
+SELECT * from t1 order by name;
 
 --echo 'Bug#35376	Value of insert_id automatically resets to 0 after inserting
 --echo ' 1st row'
@@ -97,7 +97,7 @@ INSERT into t1(name) values('Record_7');
 INSERT into t1(name) values('Record_8');
 
 --echo ## Verifying data in table t1 ##
-SELECT * from t1;
+SELECT * from t1 order by name;
 
 
 --echo ## Dropping table t1 ##

mysql-test/suite/sys_vars/t/myisam_data_pointer_size_func.test

@@ -1,4 +1,5 @@
 #Want to skip this test from daily Valgrind execution
+--source include/have_myisam.inc
 --source include/no_valgrind_without_big.inc
 ############## mysql-test\t\myisam_data_pointer_size_func.test  ################
 #                                                                              #

mysql-test/suite/sys_vars/t/myisam_stats_method_func.test

@@ -18,7 +18,7 @@
 #    http://dev.mysql.com/doc/refman/5.1/en/server-system-variables.html      #
 #                                                                             #
 ###############################################################################
-
+--source include/have_myisam.inc
 --echo '#--------------------FN_DYNVARS_097_01-------------------------#'
 #####################################################################
 # Check if Setting myisam_stats_method is changed in new connection #

mysql-test/suite/sys_vars/t/sql_low_priority_updates_func.test

@@ -20,7 +20,7 @@
 ################################################################################
 
 --source include/not_embedded.inc
-
+--source include/have_myisam.inc
 ################################################################
 # sql_low_priority_updates was renamed to low_priority_updates #
 ################################################################