database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code 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
parent 4046ed12bc f4421c893b
commit 7f19330c59
168 changed files with 4352 additions and 491 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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