diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-03-18 03:19:20 +0200 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-03-18 03:19:20 +0200 |
| commit | 21b0873a3ce5ee079b120199eb0423bdcff78c22 (patch) | |
| tree | da8cf393b1fa3a8b2096289ccb606a372e734759 /mysql-test/t | |
| parent | 53bb7b6801d19a275933b4ec8308823699c30fbd (diff) | |
| parent | cf97cbd1db762c443aa3c1412f3e788559aaa5dd (diff) | |
| download | mariadb-git-21b0873a3ce5ee079b120199eb0423bdcff78c22.tar.gz | |
Merge with 3.23 to get fix for halloween problem on Update of InnoDB tables
innobase/row/row0mysql.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
sql/key.cc:
Auto merged
configure.in:
Merge with 3.23
mysql-test/r/innodb.result:
Merge with 3.23
mysql-test/t/innodb.test:
Merge with 3.23
strings/strto.c:
Merge with 3.23
Diffstat (limited to 'mysql-test/t')
| -rw-r--r-- | mysql-test/t/innodb.test | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/mysql-test/t/innodb.test b/mysql-test/t/innodb.test index 2fcde863b9c..320047b68fa 100644 --- a/mysql-test/t/innodb.test +++ b/mysql-test/t/innodb.test @@ -758,3 +758,14 @@ SELECT * FROM t3 WHERE id1="my-test-1" LOCK IN SHARE MODE; COMMIT; set autocommit=1; DROP TABLE t1,t2,t3; + +# +# Check update with conflicting key +# + +CREATE TABLE t1 (a int not null primary key, b int not null, unique (b)) type=innodb; +INSERT INTO t1 values (1,1),(2,2),(3,3),(4,4),(5,5),(6,6),(7,7),(8,8),(9,9); +# We need the a < 1000 test here to quard against the halloween problems +UPDATE t1 set a=a+100 where b between 2 and 3 and a < 1000; +SELECT * from t1; +drop table t1; |