summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <mskold/marty@mysql.com/linux.site>2006-11-30 15:02:33 +0100
committerunknown <mskold/marty@mysql.com/linux.site>2006-11-30 15:02:33 +0100
commiteb36371ac3830b651b75d5ab05423f45002e6bf4 (patch)
treea4da1233a416d95517c84ac66e0cb6913db5bc14 /mysql-test
parent15155fff77f6d6c98e65b5d304adf6bb5d69d26e (diff)
downloadmariadb-git-eb36371ac3830b651b75d5ab05423f45002e6bf4.tar.gz
#18487 UPDATE IGNORE not supported for unique constraint violation of non-primary key: call peek_index_rows
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/ndb_update.result1
-rw-r--r--mysql-test/t/ndb_update.test1
2 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/ndb_update.result b/mysql-test/r/ndb_update.result
index 52236bb0c3d..d75f82172ae 100644
--- a/mysql-test/r/ndb_update.result
+++ b/mysql-test/r/ndb_update.result
@@ -27,6 +27,7 @@ pk1 b c
4 1 1
UPDATE t1 set pk1 = 1, c = 2 where pk1 = 4;
ERROR 23000: Duplicate entry '' for key 0
+UPDATE IGNORE t1 set pk1 = 1, c = 2 where pk1 = 4;
select * from t1 order by pk1;
pk1 b c
0 0 0
diff --git a/mysql-test/t/ndb_update.test b/mysql-test/t/ndb_update.test
index 5472dd95e9f..ebcc6995d74 100644
--- a/mysql-test/t/ndb_update.test
+++ b/mysql-test/t/ndb_update.test
@@ -29,6 +29,7 @@ UPDATE IGNORE t1 set pk1 = 4 where pk1 = 2;
select * from t1 order by pk1;
-- error 1062
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;
UPDATE t1 set pk1 = pk1 + 10;
select * from t1 order by pk1;