summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Lindström <jan.lindstrom@mariadb.com>2018-03-20 12:10:17 +0200
committerJan Lindström <jan.lindstrom@mariadb.com>2018-03-20 12:10:41 +0200
commitbc2e7d7889e35f30390d1ef8653f6ac9c038b5b2 (patch)
tree4cf915d2ab5c4b1ca161417b083ea68a23f2a1e2
parent33028f7c4bc4b702a9dd2d8462f2f79b8f37dc1f (diff)
downloadmariadb-git-bc2e7d7889e35f30390d1ef8653f6ac9c038b5b2.tar.gz
Fix test case MW-329.
-rw-r--r--mysql-test/suite/galera/r/MW-329.result1
-rw-r--r--mysql-test/suite/galera/t/MW-329.test2
2 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/suite/galera/r/MW-329.result b/mysql-test/suite/galera/r/MW-329.result
index a79ba598d69..4666d131c7d 100644
--- a/mysql-test/suite/galera/r/MW-329.result
+++ b/mysql-test/suite/galera/r/MW-329.result
@@ -19,3 +19,4 @@ VARIABLE_VALUE > 0
DROP PROCEDURE proc_insert;
DROP TABLE t1;
CALL mtr.add_suppression("conflict state 3 after post commit");
+set global innodb_status_output=Default;
diff --git a/mysql-test/suite/galera/t/MW-329.test b/mysql-test/suite/galera/t/MW-329.test
index d9f9a787442..bf045832113 100644
--- a/mysql-test/suite/galera/t/MW-329.test
+++ b/mysql-test/suite/galera/t/MW-329.test
@@ -83,3 +83,5 @@ DROP TABLE t1;
# Due to MW-330, Multiple "conflict state 3 after post commit" warnings if table is dropped while SP is running
CALL mtr.add_suppression("conflict state 3 after post commit");
+
+set global innodb_status_output=Default; \ No newline at end of file