bk commit into 5.0 tree (sergefp:1.2257) BUG#21077

[Sergey Petrunia]

Below is the list of changes that have just been committed into a local
5.0 repository of psergey. When psergey 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, 2006-08-15 21:16:02+04:00, sergefp@stripped +3 -0
  BUG#21077: 4.1->5.0 merge
  MERGE: 1.1616.2696.2

  mysql-test/r/innodb_mysql.result@stripped, 2006-08-15 21:16:00+04:00, sergefp@stripped +0 -0
    BUG#21077: 4.1->5.0 merge
    MERGE: 1.3.1.2

  mysql-test/t/innodb_mysql.test@stripped, 2006-08-15 21:16:00+04:00, sergefp@stripped +0 -0
    BUG#21077: 4.1->5.0 merge
    MERGE: 1.3.1.2

  sql/opt_range.h@stripped, 2006-08-15 21:16:00+04:00, sergefp@stripped +0 -1
    BUG#21077: 4.1->5.0 merge
    MERGE: 1.28.1.13

# 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:	sergefp
# Host:	pylon.mylan
# Root:	/home/psergey/mysql-5.0-opt-bug21077-merge/RESYNC

--- 1.6/mysql-test/r/innodb_mysql.result	2006-08-15 21:16:06 +04:00
+++ 1.7/mysql-test/r/innodb_mysql.result	2006-08-15 21:16:06 +04:00
@@ -83,6 +83,27 @@
 3	3
 3	3
 DROP TABLE t1, t2, t3;
+CREATE TABLE `t1` (`id1` INT) ;
+INSERT INTO `t1` (`id1`) VALUES (1),(5),(2);
+CREATE TABLE `t2` (
+`id1` INT,
+`id2` INT NOT NULL,
+`id3` INT,
+`id4` INT NOT NULL,
+UNIQUE (`id2`,`id4`),
+KEY (`id1`)
+) ENGINE=InnoDB;
+INSERT INTO `t2`(`id1`,`id2`,`id3`,`id4`) VALUES 
+(1,1,1,0),
+(1,1,2,1),
+(5,1,2,2),
+(6,1,2,3),
+(1,2,2,2),
+(1,2,1,1);
+SELECT `id1` FROM `t1` WHERE `id1` NOT IN (SELECT `id1` FROM `t2` WHERE `id2` = 1 AND
`id3` = 2);
+id1
+2
+DROP TABLE t1, t2;
 create table t1m (a int) engine=myisam;
 create table t1i (a int) engine=innodb;
 create table t2m (a int) engine=myisam;

--- 1.6/mysql-test/t/innodb_mysql.test	2006-08-15 21:16:06 +04:00
+++ 1.7/mysql-test/t/innodb_mysql.test	2006-08-15 21:16:06 +04:00
@@ -90,6 +90,33 @@
   t3.a = t2.a AND t2.b = t1.a AND t3.b = 1 AND t3.c IN (1, 2) 
   ORDER BY t1.b LIMIT 5;
 DROP TABLE t1, t2, t3;
+
+
+# BUG#21077 (The testcase is not deterministic so correct execution doesn't
+# prove anything) For proof one should track if sequence of ha_innodb::* func
+# calls is correct.
+CREATE TABLE `t1` (`id1` INT) ;
+INSERT INTO `t1` (`id1`) VALUES (1),(5),(2);
+
+CREATE TABLE `t2` (
+  `id1` INT,
+  `id2` INT NOT NULL,
+  `id3` INT,
+  `id4` INT NOT NULL,
+  UNIQUE (`id2`,`id4`),
+  KEY (`id1`)
+) ENGINE=InnoDB;
+
+INSERT INTO `t2`(`id1`,`id2`,`id3`,`id4`) VALUES 
+(1,1,1,0),
+(1,1,2,1),
+(5,1,2,2),
+(6,1,2,3),
+(1,2,2,2),
+(1,2,1,1);
+
+SELECT `id1` FROM `t1` WHERE `id1` NOT IN (SELECT `id1` FROM `t2` WHERE `id2` = 1 AND
`id3` = 2);
+DROP TABLE t1, t2;
 #
 # Bug #12882  	min/max inconsistent on empty table
 #