diff options
| author | monty@narttu.mysql.fi <> | 2007-01-22 19:18:22 +0200 |
|---|---|---|
| committer | monty@narttu.mysql.fi <> | 2007-01-22 19:18:22 +0200 |
| commit | 7df1dbcd74c3827b605c7c9b570e3d98a8e9f842 (patch) | |
| tree | e1f7760d143c61bab6297ac28959e5b752a764ed /mysql-test/t/ndb_update.test | |
| parent | 02bed038bb0e00660ce4eb9268b9aa13fefcb5cb (diff) | |
| parent | 2dcc7110c9fef59752e8cb01c9c79e2afb718362 (diff) | |
| download | mariadb-git-7df1dbcd74c3827b605c7c9b570e3d98a8e9f842.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/my/mysql-5.1
Diffstat (limited to 'mysql-test/t/ndb_update.test')
| -rw-r--r-- | mysql-test/t/ndb_update.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/ndb_update.test b/mysql-test/t/ndb_update.test index ebcc6995d74..335c43bc796 100644 --- a/mysql-test/t/ndb_update.test +++ b/mysql-test/t/ndb_update.test @@ -23,11 +23,11 @@ UPDATE t1 set b = c; select * from t1 order by pk1; UPDATE t1 set pk1 = 4 where pk1 = 1; select * from t1 order by pk1; ---error 1062 +--error ER_DUP_ENTRY_WITH_KEY_NAME UPDATE t1 set pk1 = 4 where pk1 = 2; UPDATE IGNORE t1 set pk1 = 4 where pk1 = 2; select * from t1 order by pk1; --- error 1062 +--error ER_DUP_ENTRY_WITH_KEY_NAME UPDATE t1 set pk1 = 1, c = 2 where pk1 = 4; UPDATE IGNORE t1 set pk1 = 1, c = 2 where pk1 = 4; select * from t1 order by pk1; |