diff options
| author | unknown <tsmith@quadxeon.mysql.com> | 2007-04-19 22:53:19 +0200 |
|---|---|---|
| committer | unknown <tsmith@quadxeon.mysql.com> | 2007-04-19 22:53:19 +0200 |
| commit | 658249981e67758cbd0047b2739fedee2d079263 (patch) | |
| tree | 42102577f2219c026fb9138469c9ac54e2313ac9 /mysql-test/include | |
| parent | 345d4fc820618d39cd60f3638386a824e7adee73 (diff) | |
| parent | 5c1546f2055b848502e96a50f46e40f26675de3c (diff) | |
| download | mariadb-git-658249981e67758cbd0047b2739fedee2d079263.tar.gz | |
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
client/mysql.cc:
Auto merged
mysql-test/r/strict.result:
Auto merged
mysql-test/t/strict.test:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
mysql-test/include/mix1.inc:
Manual merge
mysql-test/r/innodb_mysql.result:
Manual merge
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/mix1.inc | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/mysql-test/include/mix1.inc b/mysql-test/include/mix1.inc index f0d143c4570..8b754e5ee39 100644 --- a/mysql-test/include/mix1.inc +++ b/mysql-test/include/mix1.inc @@ -415,7 +415,38 @@ DROP TABLE t1; --source include/innodb_rollback_on_timeout.inc +# +# Bug #27210: INNODB ON DUPLICATE KEY UPDATE +# + +set @save_qcache_size=@@global.query_cache_size; +set @save_qcache_type=@@global.query_cache_type; +set global query_cache_size=10*1024*1024; +set global query_cache_type=1; +connect (con1,localhost,root,,); +connection con1; +drop table if exists `test`; +CREATE TABLE `test` (`test1` varchar(3) NOT NULL, + `test2` varchar(4) NOT NULL,PRIMARY KEY (`test1`)) + ENGINE=InnoDB DEFAULT CHARSET=latin1; +INSERT INTO `test` (`test1`, `test2`) VALUES ('tes', '5678'); +disconnect con1; +connect (con2,localhost,root,,); +connection con2; +select * from test; +INSERT INTO `test` (`test1`, `test2`) VALUES ('tes', '1234') + ON DUPLICATE KEY UPDATE `test2` = '1234'; +select * from test; +flush tables; +select * from test; +disconnect con2; +connection default; +set global query_cache_type=@save_qcache_type; +set global query_cache_size=@save_qcache_size; + --echo End of 5.0 tests + + # # Test of behaviour with CREATE ... SELECT # |