summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgbichot@dl145h.mysql.com <>2007-02-24 16:35:15 +0100
committergbichot@dl145h.mysql.com <>2007-02-24 16:35:15 +0100
commit2d8af6efe8ce00f0762f6c9a186ac251d9b7b593 (patch)
tree71d1f65c9b18e2d909dff176ef908f83019561d8
parentddd7c3311595e75f3b9455cfdceca5da9422b586 (diff)
downloadmariadb-git-2d8af6efe8ce00f0762f6c9a186ac251d9b7b593.tar.gz
rpl_insert_delayed.test:
fix after merge: server now returns ER_DUP_ENTRY_WITH_KEY_NAME, not ER_DUP_ENTRY
-rw-r--r--mysql-test/extra/rpl_tests/rpl_insert_delayed.test4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/extra/rpl_tests/rpl_insert_delayed.test b/mysql-test/extra/rpl_tests/rpl_insert_delayed.test
index 11856953959..2cba7ab64c8 100644
--- a/mysql-test/extra/rpl_tests/rpl_insert_delayed.test
+++ b/mysql-test/extra/rpl_tests/rpl_insert_delayed.test
@@ -42,7 +42,7 @@ if ($binlog_format_statement)
{
# statement below will be converted to non-delayed INSERT and so
# will stop at first error, guaranteeing replication.
- --error ER_DUP_ENTRY
+ --error ER_DUP_ENTRY_WITH_KEY_NAME
insert delayed into t1 values(10, "is Bond"), (20, "James Bond");
}
if (!$binlog_format_statement)
@@ -64,7 +64,7 @@ if ($binlog_format_statement)
# statement below will be converted to non-delayed INSERT and so
# will be binlogged with its ER_DUP_ENTRY error code, guaranteeing
# replication (slave will hit the same error code and so be fine).
- --error ER_DUP_ENTRY
+ --error ER_DUP_ENTRY_WITH_KEY_NAME
insert delayed into t1 values(20, "is Bond"), (10, "James Bond");
}
if (!$binlog_format_statement)