diff options
Diffstat (limited to 'mysql-test/r/merge.result')
| -rw-r--r-- | mysql-test/r/merge.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/merge.result b/mysql-test/r/merge.result index 437b001070a..85082d606a7 100644 --- a/mysql-test/r/merge.result +++ b/mysql-test/r/merge.result @@ -548,9 +548,9 @@ select * from t4 where a+0 > 90; a b 99 1 insert t5 values (1,1); -ERROR 23000: Duplicate entry '1-1' for key 1 +ERROR 23000: Duplicate entry '1-1' for key 'PRIMARY' insert t6 values (2,1); -ERROR 23000: Duplicate entry '2-1' for key 1 +ERROR 23000: Duplicate entry '2-1' for key 'PRIMARY' insert t5 values (1,1) on duplicate key update b=b+10; insert t6 values (2,1) on duplicate key update b=b+20; select * from t5 where a < 3; |