diff options
Diffstat (limited to 'mysql-test/t/merge.test')
| -rw-r--r-- | mysql-test/t/merge.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/merge.test b/mysql-test/t/merge.test index 5498468d902..ac2b9471fe9 100644 --- a/mysql-test/t/merge.test +++ b/mysql-test/t/merge.test @@ -195,9 +195,9 @@ select * from t6 order by a,b; insert into t1 values (99,NULL); select * from t4 where a+0 > 90; # bug#4008 - cannot determine a unique key that caused "dupl. key error" ---error 1062 +--error ER_DUP_ENTRY_WITH_KEY_NAME insert t5 values (1,1); ---error 1062 +--error ER_DUP_ENTRY_WITH_KEY_NAME insert t6 values (2,1); insert t5 values (1,1) on duplicate key update b=b+10; insert t6 values (2,1) on duplicate key update b=b+20; |