database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Fix for some failing tests.

Browse Source
This commit is contained in:
Nirbhay Choubey
2015-11-16 12:39:56 -05:00
parent c78fc8b1ea
commit f4421c893b
4 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,4 @@
include/master-slave.inc 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] [connection master]
CREATE TABLE t1 (f1 INTEGER PRIMARY KEY); CREATE TABLE t1 (f1 INTEGER PRIMARY KEY);
CREATE TABLE t2 (f1 INTEGER PRIMARY KEY); CREATE TABLE t2 (f1 INTEGER PRIMARY KEY);
@ -24,5 +21,4 @@ DROP TABLE t3;
DROP TABLE t2; DROP TABLE t2;
DROP TABLE t1; DROP TABLE t1;
DROP PROCEDURE p1; DROP PROCEDURE p1;
include/sync_slave_sql_with_master.inc
include/rpl_end.inc include/rpl_end.inc

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

@ -39,6 +39,6 @@ DROP TABLE t1;
DROP PROCEDURE p1; DROP PROCEDURE p1;
--source include/sync_slave_sql_with_master.inc sync_slave_with_master;
--source include/rpl_end.inc --source include/rpl_end.inc

2
mysql-test/suite/sys_vars/r/wsrep_desync_basic.result
View File

@ -1,7 +1,7 @@
# #
# wsrep_desync # 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 # save the initial value
SET @wsrep_desync_global_saved = @@global.wsrep_desync; SET @wsrep_desync_global_saved = @@global.wsrep_desync;
# default # default

2
mysql-test/suite/sys_vars/t/wsrep_desync_basic.test
View File

@ -5,7 +5,7 @@
--echo # --echo #
# expected as no wsrep provider is currently loaded # 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 --echo # save the initial value
SET @wsrep_desync_global_saved = @@global.wsrep_desync; SET @wsrep_desync_global_saved = @@global.wsrep_desync;