bk commit into 5.1 tree (gkodinov:1.2532)

[kgeorge]

Below is the list of changes that have just been committed into a local
5.1 repository of kgeorge. When kgeorge 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-05-22 17:03:16+03:00, gkodinov@stripped +7 -0
  Merge magare.gmz:/home/kgeorge/mysql/work/B28476-5.0-opt
  into  magare.gmz:/home/kgeorge/mysql/work/B28476-5.1-opt
  
  Zero merge to 5.1 : all but the new tests.
  MERGE: 1.1810.2941.1

  mysql-test/r/key.result@stripped, 2007-05-22 17:03:14+03:00, gkodinov@stripped +0 -8
    zero-merge to 5.1 the fix for bug #28476
    MERGE: 1.28.1.9

  mysql-test/r/myisam.result@stripped, 2007-05-22 17:03:14+03:00, gkodinov@stripped +6 -6
    zero-merge to 5.1 the fix for bug #28476:
    all but the test
    MERGE: 1.71.1.29

  mysql-test/t/key.test@stripped, 2007-05-22 17:03:14+03:00, gkodinov@stripped +0 -12
    zero-merge to 5.1 the fix for bug #28476
    MERGE: 1.24.1.6

  mysql-test/t/myisam.test@stripped, 2007-05-22 17:03:14+03:00, gkodinov@stripped +11 -11
    zero-merge to 5.1 the fix for bug #28476:
    all but the test
    MERGE: 1.55.1.25

  sql/sql_base.cc@stripped, 2007-05-22 17:03:14+03:00, gkodinov@stripped +0 -6
    zero-merge to 5.1 the fix for bug #28476
    MERGE: 1.235.97.1

  sql/sql_select.cc@stripped, 2007-05-22 17:03:14+03:00, gkodinov@stripped +0 -4
    zero-merge to 5.1 the fix for bug #28476
    MERGE: 1.312.1.210

  sql/table.h@stripped, 2007-05-22 17:03:14+03:00, gkodinov@stripped +0 -21
    zero-merge to 5.1 the fix for bug #28476
    MERGE: 1.102.16.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:	gkodinov
# Host:	magare.gmz
# Root:	/home/kgeorge/mysql/work/B28476-5.1-opt/RESYNC

--- 1.110/mysql-test/r/myisam.result	2007-05-04 18:06:04 +03:00
+++ 1.111/mysql-test/r/myisam.result	2007-05-22 17:03:14 +03:00
@@ -1768,6 +1768,32 @@ create table t3 (c1 int) engine=myisam p
 create table t4 (c1 int) engine=myisam pack_keys=2;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to
your MySQL server version for the right syntax to use near '2' at line 1
 drop table t1, t2, t3;
+CREATE TABLE t1(a INT, b INT, KEY inx (a), UNIQUE KEY uinx (b)) ENGINE=MyISAM;
+INSERT INTO t1(a,b) VALUES (1,1),(2,2),(3,3),(4,4),(5,5);
+SELECT a FROM t1 FORCE INDEX (inx) WHERE a=1;
+a
+1
+ALTER TABLE t1 DISABLE KEYS;
+SELECT a FROM t1 FORCE INDEX (inx) WHERE a=1;
+a
+1
+SELECT a FROM t1 USE INDEX (inx) WHERE a=1;
+a
+1
+SELECT b FROM t1 FORCE INDEX (uinx) WHERE b=1;
+b
+1
+SELECT b FROM t1 USE INDEX (uinx) WHERE b=1;
+b
+1
+SELECT a FROM t1 FORCE INDEX (inx,uinx) WHERE a=1;
+a
+1
+ALTER TABLE t1 ENABLE KEYS;
+SELECT a FROM t1 FORCE INDEX (inx) WHERE a=1;
+a
+1
+DROP TABLE t1;
 End of 5.0 tests
 create table t1 (a int not null, key `a` (a) key_block_size=1024);
 show create table t1;

--- 1.84/mysql-test/t/myisam.test	2007-03-28 18:00:36 +03:00
+++ 1.85/mysql-test/t/myisam.test	2007-05-22 17:03:14 +03:00
@@ -1129,6 +1129,22 @@ create table t3 (c1 int) engine=myisam p
 create table t4 (c1 int) engine=myisam pack_keys=2;
 drop table t1, t2, t3;
 
+#
+# Bug#28476: force index on a disabled myisam index gives error 124
+#
+CREATE TABLE t1(a INT, b INT, KEY inx (a), UNIQUE KEY uinx (b)) ENGINE=MyISAM;
+INSERT INTO t1(a,b) VALUES (1,1),(2,2),(3,3),(4,4),(5,5);
+SELECT a FROM t1 FORCE INDEX (inx) WHERE a=1;
+ALTER TABLE t1 DISABLE KEYS;
+SELECT a FROM t1 FORCE INDEX (inx) WHERE a=1;
+SELECT a FROM t1 USE INDEX (inx) WHERE a=1;
+SELECT b FROM t1 FORCE INDEX (uinx) WHERE b=1;
+SELECT b FROM t1 USE INDEX (uinx) WHERE b=1;
+SELECT a FROM t1 FORCE INDEX (inx,uinx) WHERE a=1;
+ALTER TABLE t1 ENABLE KEYS;
+SELECT a FROM t1 FORCE INDEX (inx) WHERE a=1;
+DROP TABLE t1;
+
 --echo End of 5.0 tests
 
 #