Commit 91d53ea3 authored by Jan Lindström's avatar Jan Lindström Committed by Julius Goryavsky

MDEV-33000: Fix test result file on some test cases

Changes to be committed:
	modified:   mysql-test/suite/galera/r/MW-388.result
	modified:   mysql-test/suite/galera/r/MW-86-wait1.result
	modified:   mysql-test/suite/galera/r/MW-86-wait8.result
	modified:   mysql-test/suite/galera/r/galera_myisam_autocommit.result
	modified:   mysql-test/suite/galera/r/galera_var_retry_autocommit.result
	modified:   mysql-test/suite/galera/t/galera_myisam_autocommit.test

These tests are run only using debug Galera library and changes are
only test related.
Signed-off-by: default avatarJulius Goryavsky <julius.goryavsky@mariadb.com>
parent a31598b3
...@@ -47,4 +47,4 @@ SET GLOBAL debug_dbug = NULL; ...@@ -47,4 +47,4 @@ SET GLOBAL debug_dbug = NULL;
SET debug_sync='RESET'; SET debug_sync='RESET';
SELECT @@debug_sync; SELECT @@debug_sync;
@@debug_sync @@debug_sync
ON - current signal: '' ON - current signals: ''
...@@ -4,7 +4,7 @@ SET @orig_debug=@@debug_dbug; ...@@ -4,7 +4,7 @@ SET @orig_debug=@@debug_dbug;
connection node_2; connection node_2;
SELECT @@debug_sync; SELECT @@debug_sync;
@@debug_sync @@debug_sync
ON - current signal: '' ON - current signals: ''
set debug_sync='RESET'; set debug_sync='RESET';
SET SESSION wsrep_sync_wait = 1; SET SESSION wsrep_sync_wait = 1;
SET GLOBAL debug_dbug = "+d,sync.wsrep_apply_cb"; SET GLOBAL debug_dbug = "+d,sync.wsrep_apply_cb";
...@@ -45,4 +45,4 @@ SET SESSION wsrep_sync_wait = default; ...@@ -45,4 +45,4 @@ SET SESSION wsrep_sync_wait = default;
DROP TABLE t_wait1; DROP TABLE t_wait1;
SELECT @@debug_sync; SELECT @@debug_sync;
@@debug_sync @@debug_sync
ON - current signal: '' ON - current signals: ''
...@@ -4,7 +4,7 @@ SET @orig_debug=@@debug_dbug; ...@@ -4,7 +4,7 @@ SET @orig_debug=@@debug_dbug;
connection node_2; connection node_2;
SELECT @@debug_sync; SELECT @@debug_sync;
@@debug_sync @@debug_sync
ON - current signal: '' ON - current signals: ''
SET SESSION wsrep_sync_wait = 8; SET SESSION wsrep_sync_wait = 8;
SET GLOBAL debug_dbug = "+d,sync.wsrep_apply_cb"; SET GLOBAL debug_dbug = "+d,sync.wsrep_apply_cb";
connection node_1; connection node_1;
...@@ -46,4 +46,4 @@ SET SESSION wsrep_sync_wait = default; ...@@ -46,4 +46,4 @@ SET SESSION wsrep_sync_wait = default;
DROP TABLE t_wait8; DROP TABLE t_wait8;
SELECT @@debug_sync; SELECT @@debug_sync;
@@debug_sync @@debug_sync
ON - current signal: '' ON - current signals: ''
connection node_2; connection node_2;
connection node_1; connection node_1;
SET GLOBAL wsrep_mode=REPLICATE_MYISAM;
CREATE TABLE t1 (f1 INTEGER) ENGINE=MyISAM; CREATE TABLE t1 (f1 INTEGER) ENGINE=MyISAM;
INSERT INTO t1 VALUES (1); INSERT INTO t1 VALUES (1);
INSERT INTO t1 VALUES (2), (3); INSERT INTO t1 VALUES (2), (3);
...@@ -22,6 +23,8 @@ COUNT(*) = 0 ...@@ -22,6 +23,8 @@ COUNT(*) = 0
1 1
SELECT COUNT(*) = 0 FROM t2; SELECT COUNT(*) = 0 FROM t2;
COUNT(*) = 0 COUNT(*) = 0
1 0
connection node_1;
DROP TABLE t1; DROP TABLE t1;
DROP TABLE t2; DROP TABLE t2;
SET GLOBAL wsrep_mode=DEFAULT;
...@@ -36,10 +36,7 @@ SET DEBUG_SYNC = 'now SIGNAL wsrep_retry_autocommit_continue'; ...@@ -36,10 +36,7 @@ SET DEBUG_SYNC = 'now SIGNAL wsrep_retry_autocommit_continue';
connection node_1; connection node_1;
SELECT COUNT(*) FROM t1; SELECT COUNT(*) FROM t1;
COUNT(*) COUNT(*)
connection node_1; 1
SELECT COUNT(*) FROM t1;
COUNT(*)
0
SET DEBUG_SYNC = 'RESET'; SET DEBUG_SYNC = 'RESET';
SET GLOBAL debug_dbug = NULL; SET GLOBAL debug_dbug = NULL;
DROP TABLE t1; DROP TABLE t1;
......
...@@ -7,6 +7,8 @@ ...@@ -7,6 +7,8 @@
# Without a PK # Without a PK
SET GLOBAL wsrep_mode=REPLICATE_MYISAM;
CREATE TABLE t1 (f1 INTEGER) ENGINE=MyISAM; CREATE TABLE t1 (f1 INTEGER) ENGINE=MyISAM;
INSERT INTO t1 VALUES (1); INSERT INTO t1 VALUES (1);
...@@ -41,5 +43,7 @@ TRUNCATE TABLE t1; ...@@ -41,5 +43,7 @@ TRUNCATE TABLE t1;
SELECT COUNT(*) = 0 FROM t1; SELECT COUNT(*) = 0 FROM t1;
SELECT COUNT(*) = 0 FROM t2; SELECT COUNT(*) = 0 FROM t2;
--connection node_1
DROP TABLE t1; DROP TABLE t1;
DROP TABLE t2; DROP TABLE t2;
SET GLOBAL wsrep_mode=DEFAULT;
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment