[Commits] f4421c8: Fix for some failing tests.

Nirbhay Choubey nirbhay at mariadb.com
Mon Nov 16 19:39:56 EET 2015


revision-id: f4421c893b50f05078f14d33c47d21f52f59f8a7
parent(s): c78fc8b1ea95dfab4dbf17678143d650ef645263
committer: Nirbhay Choubey
branch nick: 10.0-galera
timestamp: 2015-11-16 12:39:56 -0500
message:

Fix for some failing tests.

---
 mysql-test/suite/rpl/r/mysql-wsrep#110-2.result       | 4 ----
 mysql-test/suite/rpl/t/mysql-wsrep#110-2.test         | 2 +-
 mysql-test/suite/sys_vars/r/wsrep_desync_basic.result | 2 +-
 mysql-test/suite/sys_vars/t/wsrep_desync_basic.test   | 2 +-
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/mysql-test/suite/rpl/r/mysql-wsrep#110-2.result b/mysql-test/suite/rpl/r/mysql-wsrep#110-2.result
index 1bc802a..fd07dfc 100644
--- a/mysql-test/suite/rpl/r/mysql-wsrep#110-2.result
+++ b/mysql-test/suite/rpl/r/mysql-wsrep#110-2.result
@@ -1,7 +1,4 @@
 include/master-slave.inc
-Warnings:
-Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
 [connection master]
 CREATE TABLE t1 (f1 INTEGER PRIMARY KEY);
 CREATE TABLE t2 (f1 INTEGER PRIMARY KEY);
@@ -24,5 +21,4 @@ DROP TABLE t3;
 DROP TABLE t2;
 DROP TABLE t1;
 DROP PROCEDURE p1;
-include/sync_slave_sql_with_master.inc
 include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/mysql-wsrep#110-2.test b/mysql-test/suite/rpl/t/mysql-wsrep#110-2.test
index 4a8aa1e..2b6d079 100644
--- a/mysql-test/suite/rpl/t/mysql-wsrep#110-2.test
+++ b/mysql-test/suite/rpl/t/mysql-wsrep#110-2.test
@@ -39,6 +39,6 @@ DROP TABLE t1;
 
 DROP PROCEDURE p1;
 
---source include/sync_slave_sql_with_master.inc
+sync_slave_with_master;
 --source include/rpl_end.inc
 
diff --git a/mysql-test/suite/sys_vars/r/wsrep_desync_basic.result b/mysql-test/suite/sys_vars/r/wsrep_desync_basic.result
index 69599c4..6225b44 100644
--- a/mysql-test/suite/sys_vars/r/wsrep_desync_basic.result
+++ b/mysql-test/suite/sys_vars/r/wsrep_desync_basic.result
@@ -1,7 +1,7 @@
 #
 # wsrep_desync
 #
-call mtr.add_suppression("WSREP: SET desync failed 9 for SET @@global.wsrep_desync=ON");
+call mtr.add_suppression("WSREP: SET desync failed 9 for schema: test, query: SET @@global.wsrep_desync=ON");
 # save the initial value
 SET @wsrep_desync_global_saved = @@global.wsrep_desync;
 # default
diff --git a/mysql-test/suite/sys_vars/t/wsrep_desync_basic.test b/mysql-test/suite/sys_vars/t/wsrep_desync_basic.test
index 15226c7..0af1d33 100644
--- a/mysql-test/suite/sys_vars/t/wsrep_desync_basic.test
+++ b/mysql-test/suite/sys_vars/t/wsrep_desync_basic.test
@@ -5,7 +5,7 @@
 --echo #
 
 # expected as no wsrep provider is currently loaded
-call mtr.add_suppression("WSREP: SET desync failed 9 for SET @@global.wsrep_desync=ON");
+call mtr.add_suppression("WSREP: SET desync failed 9 for schema: test, query: SET @@global.wsrep_desync=ON");
 
 --echo # save the initial value
 SET @wsrep_desync_global_saved = @@global.wsrep_desync;


More information about the commits mailing list