Merge work:/home/bk/mysql-4.0

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0

mysql-test/r/binary.result

@@ -43,16 +43,31 @@ name
 select name from t2 where name between '' and '';
 name
 drop table t1,t2;
-create table t1 (a char(10) not null, b char(10) binary not null,index (a));
+create table t1 (a char(10) not null, b char(10) binary not null,key (a), key(b));
 insert into t1 values ("hello ","hello "),("hello2 ","hello2 ");
+select * from t1 where a="hello";
+a	b
+hello	hello
 select * from t1 where a="hello ";
 a	b
 hello	hello
-select * from t1 where b="hello ";
+select * from t1 ignore index (a) where a="hello ";
 a	b
+hello	hello
 select * from t1 where b="hello";
 a	b
 hello	hello
+select * from t1 where b="hello ";
+a	b
+hello	hello
+select * from t1 ignore index (b) where b="hello ";
+a	b
+alter table t1 modify b tinytext not null, drop key b, add key (b(100));
+select * from t1 where b="hello ";
+a	b
+select * from t1 ignore index (b) where b="hello ";
+a	b
+hello	hello
 drop table t1;
 create table t1 (b char(8));
 insert into t1 values(NULL);

mysql-test/t/binary.test

@@ -26,11 +26,18 @@ drop table t1,t2;
 # Test of binary and normal strings
 #
 
-create table t1 (a char(10) not null, b char(10) binary not null,index (a));
+create table t1 (a char(10) not null, b char(10) binary not null,key (a), key(b));
 insert into t1 values ("hello ","hello "),("hello2 ","hello2 ");
+select * from t1 where a="hello";
 select * from t1 where a="hello ";
-select * from t1 where b="hello ";
+select * from t1 ignore index (a) where a="hello ";
 select * from t1 where b="hello";
+select * from t1 where b="hello ";
+select * from t1 ignore index (b) where b="hello ";
+# blob test
+alter table t1 modify b tinytext not null, drop key b, add key (b(100));
+select * from t1 where b="hello ";
+select * from t1 ignore index (b) where b="hello ";
 drop table t1;
 
 #