diff options
| author | unknown <lars@mysql.com> | 2005-02-24 17:25:06 +0100 |
|---|---|---|
| committer | unknown <lars@mysql.com> | 2005-02-24 17:25:06 +0100 |
| commit | abd8200f77a0b5c8463628fa921f998cbf7498f9 (patch) | |
| tree | bc85dab6fdb9a811421e917cc9f7ba709c888385 /mysql-test | |
| parent | 3087b2f1fde43ea192bcf7a2fa217aadc7bf7d3a (diff) | |
| download | mariadb-git-abd8200f77a0b5c8463628fa921f998cbf7498f9.tar.gz | |
Fix of an incorrect merge
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/rpl_insert_id.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/rpl_insert_id.result b/mysql-test/r/rpl_insert_id.result index 514ab60dafe..8482f631553 100644 --- a/mysql-test/r/rpl_insert_id.result +++ b/mysql-test/r/rpl_insert_id.result @@ -72,4 +72,4 @@ SET TIMESTAMP=1000000000; CREATE TABLE t1 ( a INT UNIQUE ); SET FOREIGN_KEY_CHECKS=0; INSERT INTO t1 VALUES (1),(1); -Duplicate entry '1' for key 1 +ERROR 23000: Duplicate entry '1' for key 1 |