diff options
| author | mats@romeo.(none) <> | 2007-02-24 19:53:06 +0100 |
|---|---|---|
| committer | mats@romeo.(none) <> | 2007-02-24 19:53:06 +0100 |
| commit | 93199c9ca3585a1da8535c90f28e981bdc2fc320 (patch) | |
| tree | 6a6108e7a89cb851bdab3e2384e61168eec6d4dd | |
| parent | 57e0bb85e6d43ea9bca288bb5294c991c367bd7c (diff) | |
| parent | 2d8af6efe8ce00f0762f6c9a186ac251d9b7b593 (diff) | |
| download | mariadb-git-93199c9ca3585a1da8535c90f28e981bdc2fc320.tar.gz | |
Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl
into romeo.(none):/home/bk/b26286-mysql-5.1-rpl
| -rw-r--r-- | mysql-test/extra/rpl_tests/rpl_insert_delayed.test | 4 |
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) |