bk commit into 5.0 tree (tsmith:1.2439) BUG#27210

[tim]

Below is the list of changes that have just been committed into a local
5.0 repository of tsmith. When tsmith does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-04-19 22:38:12+02:00, tsmith@stripped +2 -0
  innodb_mysql.test, innodb_mysql.result:
    Add test case for Bug #27210: INNODB ON DUPLICATE KEY UPDATE

  mysql-test/r/innodb_mysql.result@stripped, 2007-04-19 22:37:50+02:00,
tsmith@stripped +25 -0
    Add test case for Bug #27210: INNODB ON DUPLICATE KEY UPDATE

  mysql-test/t/innodb_mysql.test@stripped, 2007-04-19 22:37:50+02:00,
tsmith@stripped +29 -0
    Add test case for Bug #27210: INNODB ON DUPLICATE KEY UPDATE

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tsmith
# Host:	quadxeon.mysql.com
# Root:	/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50

--- 1.16/mysql-test/r/innodb_mysql.result	2007-02-11 08:55:54 +01:00
+++ 1.17/mysql-test/r/innodb_mysql.result	2007-04-19 22:37:50 +02:00
@@ -446,4 +446,29 @@ a
 2
 5
 drop table t1;
+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;
+drop table if exists `test`;
+Warnings:
+Note	1051	Unknown table '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');
+select * from test;
+test1	test2
+tes	5678
+INSERT INTO `test` (`test1`, `test2`) VALUES ('tes', '1234')
+ON DUPLICATE KEY UPDATE `test2` = '1234';
+select * from test;
+test1	test2
+tes	1234
+flush tables;
+select * from test;
+test1	test2
+tes	1234
+set global query_cache_type=@save_qcache_type;
+set global query_cache_size=@save_qcache_size;
 End of 5.0 tests

--- 1.16/mysql-test/t/innodb_mysql.test	2007-02-11 08:55:54 +01:00
+++ 1.17/mysql-test/t/innodb_mysql.test	2007-04-19 22:37:50 +02:00
@@ -412,4 +412,33 @@ 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