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

bug#54935

Browse Source 
applying bundle made for next-mr-bugfixing to trunk-bugfixing branch of the bug
This commit is contained in:
Andrei Elkin
2010-07-16 21:25:00 +03:00
parent 923da1e889
commit 30e2c6f19b
18 changed files with 77 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,7 +19,8 @@ a
1
[on slave]
---- Wait until slave stops with an error ----
Last_SQL_Error = Error 'Duplicate entry '1' for key 'PRIMARY'' on query. Default database: 'test'. Query: 'INSERT INTO t1 VALUES (1)' (expected "duplicate key" error)
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;
a
1