summaryrefslogtreecommitdiff
path: root/mysql-test/t/insert.test
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2009-11-02 14:10:04 +0300
committerAlexander Nozdrin <alik@sun.com>2009-11-02 14:10:04 +0300
commita708ba6524f27d0f0bc3bc4b4b9952f372d38bd0 (patch)
tree52d813ba1e4f0b538b1f175a1d157d865cce8a22 /mysql-test/t/insert.test
parent487bfd56d4386fe9abbd4beb80d759b0c5c95909 (diff)
parent46aa4c2672e2d0b1727dde5b80bd5039adbf96f6 (diff)
downloadmariadb-git-a708ba6524f27d0f0bc3bc4b4b9952f372d38bd0.tar.gz
Manual merge from mysql-next-mr.
Diffstat (limited to 'mysql-test/t/insert.test')
-rw-r--r--mysql-test/t/insert.test2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/t/insert.test b/mysql-test/t/insert.test
index f2b9e61915e..40d1464b86a 100644
--- a/mysql-test/t/insert.test
+++ b/mysql-test/t/insert.test
@@ -235,8 +235,10 @@ insert into t1 values (1,11), (2,22);
insert into t2 values (1,12), (2,24);
--error 1393
insert into v1 (f1) values (3) on duplicate key update f3= f3 + 10;
+--error 1393
insert into v1 (f1) values (3) on duplicate key update f1= f3 + 10;
select * from t1;
+--error 1393
insert into v1 (f1) values (3) on duplicate key update f1= f3 + 10;
select * from t1;
drop view v1;