Fix Some failing tests

SachinSetiya · mariadb-SachinSetiya · commit 633959525ced · 2017-04-06T15:41:54.000+05:30
Signed-off-by: Sachin Setiya &lt;sachinsetia1001@gmail.com&gt;
diff --git a/mysql-test/suite/galera/t/MW-258.test b/mysql-test/suite/galera/t/MW-258.test
@@ -34,6 +34,7 @@ UNLOCK TABLES;
 
 --connection node_1
 --echo value after RSU:
+--sleep 3
 SHOW STATUS LIKE 'wsrep_desync_count';
 SHOW VARIABLES LIKE 'wsrep_desync';
 SET GLOBAL wsrep_desync=0;
diff --git a/mysql-test/suite/galera/t/MW-313.test b/mysql-test/suite/galera/t/MW-313.test
@@ -3,6 +3,7 @@
 #
 
 --source include/galera_cluster.inc
+--source include/have_innodb.inc
 --source include/have_binlog_format_row.inc
 
 # No error expected for SELECT and SHOW
diff --git a/mysql-test/suite/galera/t/MW-328A.test b/mysql-test/suite/galera/t/MW-328A.test
@@ -8,6 +8,7 @@
 #
 
 --source include/galera_cluster.inc
+--source include/have_innodb.inc
 --source suite/galera/t/MW-328-header.inc
 
 --connection node_2
diff --git a/mysql-test/suite/galera/t/MW-328B.test b/mysql-test/suite/galera/t/MW-328B.test
@@ -8,6 +8,7 @@
 #
 
 --source include/galera_cluster.inc
+--source include/have_innodb.inc
 --source suite/galera/t/MW-328-header.inc
 
 --connection node_2
diff --git a/mysql-test/suite/galera/t/MW-328C.test b/mysql-test/suite/galera/t/MW-328C.test
@@ -8,6 +8,7 @@
 #
 
 --source include/galera_cluster.inc
+--source include/have_innodb.inc
 --source suite/galera/t/MW-328-header.inc
 
 --connection node_2
diff --git a/mysql-test/suite/galera/t/MW-328D.test b/mysql-test/suite/galera/t/MW-328D.test
@@ -7,6 +7,7 @@
 #
 
 --source include/galera_cluster.inc
+--source include/have_innodb.inc
 
 CREATE TABLE t1 (i INT) ENGINE = InnoDB;
 INSERT INTO t1 (i) VALUES(1);
diff --git a/mysql-test/suite/galera/t/MW-328E.test b/mysql-test/suite/galera/t/MW-328E.test
@@ -7,6 +7,7 @@
 #
 
 --source include/galera_cluster.inc
+--source include/have_innodb.inc
 
 create table t1 (i int primary key, j int) engine=innodb;
 create table t2 (i int primary key, j int) engine=innodb;
diff --git a/mysql-test/suite/galera/t/MW-329.test b/mysql-test/suite/galera/t/MW-329.test
@@ -3,6 +3,7 @@
 #
 
 --source include/galera_cluster.inc
+--source include/have_innodb.inc
 
 CREATE TABLE t1 (f1 INTEGER, f2 CHAR(20) DEFAULT 'abc') ENGINE=InnoDB;
 
diff --git a/mysql-test/suite/galera/t/galera_var_retry_autocommit.test b/mysql-test/suite/galera/t/galera_var_retry_autocommit.test
@@ -4,6 +4,7 @@
 #
 
 --source include/galera_cluster.inc
+--source include/have_innodb.inc
 
 --connection node_1
 CREATE TABLE t1 (f1 INTEGER PRIMARY KEY, f2 INTEGER) ENGINE=InnoDB;

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`#`
`4`	`4`
`5`	`5`	`--source include/galera_cluster.inc`
	`6`	`+--source include/have_innodb.inc`
`6`	`7`	`--source include/have_binlog_format_row.inc`
`7`	`8`
`8`	`9`	`# No error expected for SELECT and SHOW`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`#`
`9`	`9`
`10`	`10`	`--source include/galera_cluster.inc`
	`11`	`+--source include/have_innodb.inc`
`11`	`12`	`--source suite/galera/t/MW-328-header.inc`
`12`	`13`
`13`	`14`	`--connection node_2`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`#`
`8`	`8`
`9`	`9`	`--source include/galera_cluster.inc`
	`10`	`+--source include/have_innodb.inc`
`10`	`11`
`11`	`12`	`CREATE TABLE t1 (i INT) ENGINE = InnoDB;`
`12`	`13`	`INSERT INTO t1 (i) VALUES(1);`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`#`
`5`	`5`
`6`	`6`	`--source include/galera_cluster.inc`
	`7`	`+--source include/have_innodb.inc`
`7`	`8`
`8`	`9`	`--connection node_1`
`9`	`10`	`CREATE TABLE t1 (f1 INTEGER PRIMARY KEY, f2 INTEGER) ENGINE=InnoDB;`