Fixed testcase after last changes

1 files changed, 8 insertions, 5 deletions

diff --git a/mysql-test/r/select_safe.result b/mysql-test/r/select_safe.result
index 830390ebe3c..ca5c03bdb50 100644
--- a/mysql-test/r/select_safe.result
+++ b/mysql-test/r/select_safe.result
@@ -1,6 +1,6 @@
 drop table if exists t1;
 SET SQL_SAFE_UPDATES=1,SQL_SELECT_LIMIT=4, SQL_MAX_JOIN_SIZE=9;
-create table t1 (a int auto_increment primary key, b char(20), key(b));
+create table t1 (a int auto_increment primary key, b char(20));
 insert into t1 values(1,"test");
 SELECT SQL_BUFFER_RESULT * from t1;
 a	b
@@ -22,9 +22,11 @@ select 1 from t1,t1 as t2,t1 as t3;
 update t1 set b="a";
 You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column
 update t1 set b="a" where b="test";
+You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column
 delete from t1;
 You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column
 delete from t1 where b="test";
+You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column
 delete from t1 where a+0=1;
 You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column
 select 1 from t1,t1 as t2,t1 as t3,t1 as t4,t1 as t5;
@@ -33,18 +35,19 @@ update t1 set b="a" limit 1;
 update t1 set b="a" where b="b" limit 2;
 delete from t1 where b="test" limit 1;
 delete from t1 where a+0=1 limit 2;
+alter table t1 add key b (b);
 SET MAX_JOIN_SIZE=2;
 SELECT @@MAX_JOIN_SIZE, @@SQL_BIG_SELECTS;
 @@max_join_size	@@sql_big_selects
 2	0
 insert into t1 values (null,"a"),(null,"a"),(null,"a"),(null,"a"),(null,"a"),(null,"a"),(null,"a"),(null,"a"),(null,"a"),(null,"a");
-SELECT * from t1;
+SELECT * from t1 order by a;
 The SELECT would examine more rows than MAX_JOIN_SIZE. Check your WHERE and use SET SQL_BIG_SELECTS=1 or SET SQL_MAX_JOIN_SIZE=# if the SELECT is ok
 SET SQL_BIG_SELECTS=1;
-SELECT * from t1;
+SELECT * from t1 order by a;
 a	b
-3	a
 2	test2
+3	a
 4	a
 5	a
 SET MAX_JOIN_SIZE=2;
@@ -53,8 +56,8 @@ The SELECT would examine more rows than MAX_JOIN_SIZE. Check your WHERE and use
 SET MAX_JOIN_SIZE=DEFAULT;
 SELECT * from t1;
 a	b
-3	a
 2	test2
+3	a
 4	a
 5	a
 SELECT @@MAX_SEEKS_FOR_KEY;