bk commit into 4.1 tree (evgen:1.2445) BUG#11039

[eugene]

Below is the list of changes that have just been committed into a local
4.1 repository of evgen. When evgen 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.2445 05/09/19 04:36:40 evgen@stripped +3 -0
  innodb.test, innodb.result:
    Backport from 5.0 of test case for bug#11039
  opt_sum.cc:
  Fix bug #13218: InnoDB: using a partial-field key prefix in search
  
  This is backport from 5.0 of fix for bug #11039

  mysql-test/t/innodb.test
    1.75 05/09/19 04:34:38 evgen@stripped +9 -0
    Backport from 5.0 of test case for bug#11039

  mysql-test/r/innodb.result
    1.104 05/09/19 04:34:07 evgen@stripped +9 -0
    Backport from 5.0 of test case for bug#11039

  sql/opt_sum.cc
    1.43 05/09/19 04:31:19 evgen@stripped +2 -1
    Fix bug #13218:  backport from 5.0 of bug #11039 fix

# 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:	evgen
# Host:	moonbone.local
# Root:	/work/13218-bug-4.1-mysql

--- 1.42/sql/opt_sum.cc	2005-03-05 07:13:42 +03:00
+++ 1.43/sql/opt_sum.cc	2005-09-19 04:31:19 +04:00
@@ -661,7 +661,8 @@
               If key_part2 may be NULL, then we want to find the first row
               that is not null
             */
-            ref->key_buff[ref->key_length++]= 1;
+            ref->key_buff[ref->key_length]= 1;
+            ref->key_length+= part->store_length;
             *range_fl&= ~NO_MIN_RANGE;
             *range_fl|= NEAR_MIN;                // > NULL
           }

--- 1.103/mysql-test/r/innodb.result	2005-09-12 19:48:12 +04:00
+++ 1.104/mysql-test/r/innodb.result	2005-09-19 04:34:07 +04:00
@@ -1685,3 +1685,12 @@
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	3	Using filesort
 drop table t1;
+create table t1 (a char(1), b char(1), key(a, b)) engine=innodb;
+insert into t1 values ('8', '6'), ('4', '7');
+select min(a) from t1;
+min(a)
+4
+select min(b) from t1 where a='8';
+min(b)
+6
+drop table t1;

--- 1.74/mysql-test/t/innodb.test	2005-09-12 19:48:12 +04:00
+++ 1.75/mysql-test/t/innodb.test	2005-09-19 04:34:38 +04:00
@@ -1230,4 +1230,13 @@
 explain select * from t1 order by a,b,c,d;
 drop table t1;
 
+#
+# BUG#11039,#13218 Wrong key length in min()
+#
+
+create table t1 (a char(1), b char(1), key(a, b)) engine=innodb;
+insert into t1 values ('8', '6'), ('4', '7');
+select min(a) from t1;
+select min(b) from t1 where a='8';
+drop table t1;
 # End of 4.1 tests