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

Automatic merge

Browse Source
This commit is contained in:
Michael Widenius
2012-09-22 17:11:40 +03:00
parent 288eeb3a31 3e83c4e8f9
commit 620d14f8c3
170 changed files with 3684 additions and 929 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/extra/rpl_tests/rpl_insert_delayed.test
View File

@ -102,7 +102,9 @@ CREATE TABLE t1(a int, UNIQUE(a));
--let $_start= query_get_value(SHOW MASTER STATUS, Position, 1)
INSERT DELAYED IGNORE INTO t1 VALUES(1);
--disable_warnings
INSERT DELAYED IGNORE INTO t1 VALUES(1);
--enable_warnings
flush table t1; # to wait for INSERT DELAYED to be done
if (`SELECT @@global.binlog_format = 'STATEMENT'`)
{