database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merged BUG#49978 from 5.1-bugteam to 5.5-bugteam.

Browse Source
This commit is contained in:
Sven Sandberg
2010-12-19 18:15:12 +01:00
parent a3cc81fa70 8b27f9a05e
commit 1bd213aec3
831 changed files with 7924 additions and 6322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mysql-test/suite/rpl/r/rpl_stm_conflicts.result
View File

@@ -1,9 +1,5 @@
stop slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
reset master;
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
include/master-slave.inc
[connection master]
==== Initialize ====
[on master]
CREATE TABLE t1(a INT PRIMARY KEY);
@@ -19,6 +15,7 @@ a
1
[on slave]
---- Wait until slave stops with an error ----
include/wait_for_slave_sql_error.inc [errno=1062]
Last_SQL_Error (expected "duplicate key" error)
Error 'Duplicate entry '1' for key 'PRIMARY'' on query. Default database: 'test'. Query: 'INSERT INTO t1 VALUES (1)'
SELECT * FROM t1;
@@ -27,6 +24,7 @@ a
---- Resolve the conflict on the slave and restart SQL thread ----
DELETE FROM t1 WHERE a = 1;
START SLAVE SQL_THREAD;
include/wait_for_slave_sql_to_start.inc
---- Sync slave and verify that there is no error ----
Last_SQL_Error = '' (expected no error)
SELECT * FROM t1;
@@ -53,3 +51,4 @@ a
[on master]
DROP TABLE t1;
[on slave]
include/rpl_end.inc