Skip to content

Commit f4421c8

Browse files
author
Nirbhay Choubey
committed
Fix for some failing tests.
1 parent c78fc8b commit f4421c8

File tree

4 files changed

+3
-7
lines changed

4 files changed

+3
-7
lines changed

mysql-test/suite/rpl/r/mysql-wsrep#110-2.result

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
include/master-slave.inc
2-
Warnings:
3-
Note #### Sending passwords in plain text without SSL/TLS is extremely insecure.
4-
Note #### Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
52
[connection master]
63
CREATE TABLE t1 (f1 INTEGER PRIMARY KEY);
74
CREATE TABLE t2 (f1 INTEGER PRIMARY KEY);
@@ -24,5 +21,4 @@ DROP TABLE t3;
2421
DROP TABLE t2;
2522
DROP TABLE t1;
2623
DROP PROCEDURE p1;
27-
include/sync_slave_sql_with_master.inc
2824
include/rpl_end.inc

mysql-test/suite/rpl/t/mysql-wsrep#110-2.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@ DROP TABLE t1;
3939

4040
DROP PROCEDURE p1;
4141

42-
--source include/sync_slave_sql_with_master.inc
42+
sync_slave_with_master;
4343
--source include/rpl_end.inc
4444

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# wsrep_desync
33
#
4-
call mtr.add_suppression("WSREP: SET desync failed 9 for SET @@global.wsrep_desync=ON");
4+
call mtr.add_suppression("WSREP: SET desync failed 9 for schema: test, query: SET @@global.wsrep_desync=ON");
55
# save the initial value
66
SET @wsrep_desync_global_saved = @@global.wsrep_desync;
77
# default

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
--echo #
66

77
# expected as no wsrep provider is currently loaded
8-
call mtr.add_suppression("WSREP: SET desync failed 9 for SET @@global.wsrep_desync=ON");
8+
call mtr.add_suppression("WSREP: SET desync failed 9 for schema: test, query: SET @@global.wsrep_desync=ON");
99

1010
--echo # save the initial value
1111
SET @wsrep_desync_global_saved = @@global.wsrep_desync;

0 commit comments

Comments
 (0)