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

Merge branch '5.5-galera' into 10.0-galera

Browse Source
This commit is contained in:
Nirbhay Choubey
2015-08-25 11:15:45 -04:00
parent c6a0cbdac6 472d66320d
commit f533b2b462
7 changed files with 191 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/include/check-warnings.test
View File

@ -11,6 +11,10 @@
# Don't write these queries to binlog
set SQL_LOG_BIN=0;
# Do not replicate updates to other galera nodes
--error 0,1193
set WSREP_ON=0;
# Turn off any debug crashes, allow the variable to be
# non existent in release builds
--error 0,1193