diff options
author | unknown <monty@mysql.com> | 2005-05-14 16:24:36 +0300 |
---|---|---|
committer | unknown <monty@mysql.com> | 2005-05-14 16:24:36 +0300 |
commit | 2059908b9ce2bde6848f247c4ee4a72a7e42738a (patch) | |
tree | 438b1bf66c03f295f0c2546a80859345423c0539 /mysql-test/t/insert_update.test | |
parent | 037b0a7b14288f078bb3e6e75c14b4fc3181b4f0 (diff) | |
download | mariadb-git-2059908b9ce2bde6848f247c4ee4a72a7e42738a.tar.gz |
After merge fixes
BitKeeper/deleted/.del-outfile2.result~fb702ee2518d8e6d:
Delete: mysql-test/r/outfile2.result
libmysql/libmysql.c:
Fix indentation for new function mysql_set_character_set()
mysql-test/r/alter_table.result:
Fix test to be in same order as in 4.0
mysql-test/r/innodb.result:
After merge fix
mysql-test/r/insert_update.result:
Add extra test for insert into ... on duplicate key upate
mysql-test/r/outfile.result:
After merge fix
mysql-test/t/alter_table.test:
Fix test to be in same order as in 4.0
mysql-test/t/insert_update.test:
Add extra test for insert into ... on duplicate key upate
mysql-test/t/outfile.test:
After merge fix
sql/item_func.cc:
After merge fix
sql/sql_table.cc:
After merge fix
Diffstat (limited to 'mysql-test/t/insert_update.test')
-rw-r--r-- | mysql-test/t/insert_update.test | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mysql-test/t/insert_update.test b/mysql-test/t/insert_update.test index 0fa366586b3..f5857840588 100644 --- a/mysql-test/t/insert_update.test +++ b/mysql-test/t/insert_update.test @@ -85,10 +85,14 @@ DROP TABLE t2; # Bug#9725 - "disapearing query/hang" and "unknown error" with "on duplicate key update" # INSERT INGORE...UPDATE gives bad error or breaks protocol. # -create table t1 (a int not null unique); +create table t1 (a int not null unique) engine=myisam; insert into t1 values (1),(2); insert ignore into t1 select 1 on duplicate key update a=2; select * from t1; insert ignore into t1 select a from t1 on duplicate key update a=a+1 ; select * from t1; +insert into t1 select 1 on duplicate key update a=2; +select * from t1; +--error 1062 +insert into t1 select a from t1 on duplicate key update a=a+1 ; drop table t1; |