mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-20 07:15:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'github/10.0-galera' into 10.1

Browse source
This commit is contained in:
Sergei Golubchik 2015-11-19 17:48:36 +01:00
commit 7f19330c59
168 changed files with 4353 additions and 492 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mysql-test/suite/sys_vars/r/sysvars_wsrep.result
View file

@ -367,7 +367,7 @@ READ_ONLY NO
COMMAND_LINE_ARGUMENT OPTIONAL
VARIABLE_NAME WSREP_PATCH_VERSION
SESSION_VALUE NULL
GLOBAL_VALUE wsrep_25.10
GLOBAL_VALUE wsrep_25.11
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE NULL
VARIABLE_SCOPE GLOBAL

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

@ -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

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

@ -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;