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

MDEV-6247: Merge 10.0-galera to 10.1.

Browse Source 
Merged lp:maria/maria-10.0-galera up to revision 3879.

Added a new functions to handler API to forcefully abort_transaction,
producing fake_trx_id, get_checkpoint and set_checkpoint for XA. These
were added for future possiblity to add more storage engines that
could use galera replication.
This commit is contained in:
Jan Lindström
2014-08-06 15:39:15 +03:00
parent e974b56438
commit df4dd593f2
327 changed files with 28127 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mysql-test/suite/binlog/r/binlog_row_binlog.result
View File

@ -806,9 +806,11 @@ SELECT * FROM t1;
c1
1
# Their values should be ON
SHOW SESSION VARIABLES LIKE "%_checks";
SHOW SESSION VARIABLES LIKE "foreign_key_checks";
Variable_name Value
foreign_key_checks ON
SHOW SESSION VARIABLES LIKE "unique_checks";
Variable_name Value
unique_checks ON
SET @@SESSION.foreign_key_checks= OFF;
@ -824,9 +826,11 @@ c1
1
2
# Their values should be OFF
SHOW SESSION VARIABLES LIKE "%_checks";
SHOW SESSION VARIABLES LIKE "foreign_key_checks";
Variable_name Value
foreign_key_checks OFF
SHOW SESSION VARIABLES LIKE "unique_checks";
Variable_name Value
unique_checks OFF
# INSERT INTO t1 VALUES(2)
# foreign_key_checks=1 and unique_checks=1
@ -842,8 +846,10 @@ c1
1
2
# Their values should be OFF
SHOW SESSION VARIABLES LIKE "%_checks";
SHOW SESSION VARIABLES LIKE "foreign_key_checks";
Variable_name Value
foreign_key_checks OFF
SHOW SESSION VARIABLES LIKE "unique_checks";
Variable_name Value
unique_checks OFF
DROP TABLE t1;

12
mysql-test/suite/binlog/r/binlog_stm_binlog.result
View File

@ -618,9 +618,11 @@ SELECT * FROM t1;
c1
1
# Their values should be ON
SHOW SESSION VARIABLES LIKE "%_checks";
SHOW SESSION VARIABLES LIKE "foreign_key_checks";
Variable_name Value
foreign_key_checks ON
SHOW SESSION VARIABLES LIKE "unique_checks";
Variable_name Value
unique_checks ON
SET @@SESSION.foreign_key_checks= OFF;
@ -636,9 +638,11 @@ c1
1
2
# Their values should be OFF
SHOW SESSION VARIABLES LIKE "%_checks";
SHOW SESSION VARIABLES LIKE "foreign_key_checks";
Variable_name Value
foreign_key_checks OFF
SHOW SESSION VARIABLES LIKE "unique_checks";
Variable_name Value
unique_checks OFF
# INSERT INTO t1 VALUES(2)
# foreign_key_checks=1 and unique_checks=1
@ -654,8 +658,10 @@ c1
1
2
# Their values should be OFF
SHOW SESSION VARIABLES LIKE "%_checks";
SHOW SESSION VARIABLES LIKE "foreign_key_checks";
Variable_name Value
foreign_key_checks OFF
SHOW SESSION VARIABLES LIKE "unique_checks";
Variable_name Value
unique_checks OFF
DROP TABLE t1;