summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSachin Setiya <sachinsetia1001@gmail.com>2017-03-14 18:41:38 +0530
committerSachin Setiya <sachin.setiya@mariadb.com>2017-04-06 15:41:54 +0530
commit633959525ced3f114d3d2dafa6b5b798ec6b26f1 (patch)
tree89cdd3bcf74b75313e4478f4d203b91b50299f11
parentadc151fdafb4a2935eddb8f89057dd7b6e9b1b10 (diff)
downloadmariadb-git-633959525ced3f114d3d2dafa6b5b798ec6b26f1.tar.gz
Fix Some failing tests
Signed-off-by: Sachin Setiya <sachinsetia1001@gmail.com>
-rw-r--r--mysql-test/suite/galera/t/MW-258.test1
-rw-r--r--mysql-test/suite/galera/t/MW-313.test1
-rw-r--r--mysql-test/suite/galera/t/MW-328A.test1
-rw-r--r--mysql-test/suite/galera/t/MW-328B.test1
-rw-r--r--mysql-test/suite/galera/t/MW-328C.test1
-rw-r--r--mysql-test/suite/galera/t/MW-328D.test1
-rw-r--r--mysql-test/suite/galera/t/MW-328E.test1
-rw-r--r--mysql-test/suite/galera/t/MW-329.test1
-rw-r--r--mysql-test/suite/galera/t/galera_var_retry_autocommit.test1
9 files changed, 9 insertions, 0 deletions
diff --git a/mysql-test/suite/galera/t/MW-258.test b/mysql-test/suite/galera/t/MW-258.test
index f5519f8a081..174dd2c02c6 100644
--- 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
index d697cb2cfcd..92fd835c615 100644
--- 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
index 836dd088749..4d6e1ea3625 100644
--- 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
index 11969dd0b47..a7b4053ab0c 100644
--- 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
index 7241dfbdbca..b681e743ab3 100644
--- 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
index e8a22f22a99..d5cffdb8f47 100644
--- 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
index 34b17be7b08..fd4b0bf9039 100644
--- 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
index 445f8795dff..acf6763b396 100644
--- 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
index 6ef647b24e1..bf4da3234c5 100644
--- 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;