bk commit into 5.1 tree (mhansson:1.2412)

[mhansson]

Below is the list of changes that have just been committed into a local
5.1 repository of mhansson. When mhansson 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-01-29 10:18:11+01:00, mhansson@stripped +1 -0
  Merge bk-internal:/home/bk/mysql-5.1-opt
  into  dl145s.mysql.com:/dev/shm/5.1o-bug20604-tp
  MERGE: 1.2401.1.8

  mysql-test/t/key.test@stripped, 2007-01-29 10:18:07+01:00, mhansson@stripped +0 -0
    Auto merged
    MERGE: 1.31.1.1

# 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:	mhansson
# Host:	dl145s.mysql.com
# Root:	/dev/shm/5.1o-bug20604-tp/RESYNC

--- 1.32/mysql-test/t/key.test	2007-01-22 17:42:49 +01:00
+++ 1.33/mysql-test/t/key.test	2007-01-29 10:18:07 +01:00
@@ -442,3 +442,14 @@ alter table t1 drop index i3, drop index
 alter table t1 add index i3 (c3), add index i2 (c2), add unique index i1 (c1);
 drop table t1;
 
+
+#
+# Bug #20604: Test for disabled keys with aggregate functions and FORCE INDEX.
+#
+
+CREATE TABLE t1( a TINYINT, KEY(a) ) ENGINE=MyISAM;
+INSERT INTO t1 VALUES( 1 );
+ALTER TABLE t1 DISABLE KEYS;
+EXPLAIN SELECT MAX(a) FROM t1 FORCE INDEX(a);
+
+drop table t1;