bk commit into 5.0 tree (sergefp:1.1959) BUG#8441

[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
  1.1959 05/06/20 08:56:37 sergefp@stripped +3 -0
  Fix for BUG#8441: in index_merge code when creating index search tuples use
   KEY_PART_INFO::store_length, not KEY_PART_INFO::length (like range code does)

  sql/opt_range.cc
    1.170 05/06/20 08:55:22 sergefp@stripped +2 -2
    Fix for BUG#8441: in index_merge code when creating index search tuples use
     KEY_PART_INFO::store_length, not KEY_PART_INFO::length (like range code does)

  mysql-test/t/index_merge_innodb.test
    1.6 05/06/20 08:55:22 sergefp@stripped +11 -0
    Testcase for BUG8441

  mysql-test/r/index_merge_innodb.result
    1.9 05/06/20 08:55:22 sergefp@stripped +11 -0
    Testcase for BUG8441

# 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:	newbox.mylan
# Root:	/home/psergey/mysql-5.0-back-vac-look

--- 1.169/sql/opt_range.cc	2005-06-14 09:52:38 +00:00
+++ 1.170/sql/opt_range.cc	2005-06-20 08:55:22 +00:00
@@ -2593,12 +2593,12 @@
       {
         tuple_arg= scan->sel_arg;
         /* Here we use the length of the first key part */
-        tuple_arg->store_min(key_part->length, &key_ptr, 0);
+        tuple_arg->store_min(key_part->store_length, &key_ptr, 0);
       }
       while (tuple_arg->next_key_part != sel_arg)
       {
         tuple_arg= tuple_arg->next_key_part;
-        tuple_arg->store_min(key_part[tuple_arg->part].length, &key_ptr, 0);
+        tuple_arg->store_min(key_part[tuple_arg->part].store_length, &key_ptr,
0);
       }
       min_range.length= max_range.length= ((char*) key_ptr - (char*) key_val);
       records= (info->param->table->file->

--- 1.8/mysql-test/r/index_merge_innodb.result	2005-02-08 22:49:32 +00:00
+++ 1.9/mysql-test/r/index_merge_innodb.result	2005-06-20 08:55:22 +00:00
@@ -123,3 +123,14 @@
 count(*)
 4
 drop table t1,t2;
+create table t1 (
+id1 int,
+id2 date ,
+index idx2 (id1,id2),
+index idx1 (id2)  
+) engine = innodb;
+insert into t1 values(1,'20040101'), (2,'20040102');
+select * from t1  where id1 = 1  and id2= '20040101';
+id1	id2
[phone]
+drop table t1;

--- 1.5/mysql-test/t/index_merge_innodb.test	2005-01-16 21:18:16 +00:00
+++ 1.6/mysql-test/t/index_merge_innodb.test	2005-06-20 08:55:22 +00:00
@@ -120,3 +120,14 @@
 
 drop table t1,t2;
 
+# Test for BUG#8441
+create table t1 (
+  id1 int,
+  id2 date ,
+  index idx2 (id1,id2),
+  index idx1 (id2)  
+) engine = innodb;
+insert into t1 values(1,'20040101'), (2,'20040102');
+select * from t1  where id1 = 1  and id2= '20040101'; 
+drop table t1;
+