Fixed bug in SET SQL_BIG_SELECTS

mysql-test/r/select_safe.result:
  Updated results
mysql-test/t/select_safe.test:
  Added test for SQL_BIG_SELECTS
sql/set_var.cc:
  Fixed bug in SQL_BIG_SELECTS
sql/share/czech/errmsg.txt:
  Updated error messages
sql/share/danish/errmsg.txt:
  Updated error messages
sql/share/dutch/errmsg.txt:
  Updated error messages
sql/share/english/errmsg.txt:
  Updated error messages
sql/share/estonian/errmsg.txt:
  Updated error messages
sql/share/french/errmsg.txt:
  Updated error messages
sql/share/german/errmsg.txt:
  Updated error messages
sql/share/greek/errmsg.txt:
  Updated error messages
sql/share/hungarian/errmsg.txt:
  Updated error messages
sql/share/italian/errmsg.txt:
  Updated error messages
sql/share/japanese/errmsg.txt:
  Updated error messages
sql/share/korean/errmsg.txt:
  Updated error messages
sql/share/norwegian-ny/errmsg.txt:
  Updated error messages
sql/share/norwegian/errmsg.txt:
  Updated error messages
sql/share/portuguese/errmsg.txt:
  Updated error messages
sql/share/romanian/errmsg.txt:
  Updated error messages
sql/share/russian/errmsg.txt:
  Updated error messages
sql/share/slovak/errmsg.txt:
  Updated error messages
sql/share/spanish/errmsg.txt:
  Updated error messages
sql/share/swedish/errmsg.txt:
  Updated error messages
sql/share/ukrainian/errmsg.txt:
  Updated error messages

1 files changed, 26 insertions, 2 deletions

diff --git a/mysql-test/r/select_safe.result b/mysql-test/r/select_safe.result
index e225a0e3995..3303f19d9c7 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 primary key, b char(20));
+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
@@ -30,10 +30,34 @@ You are using safe update mode and you tried to update a table without a WHERE t
 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;
-The SELECT would examine too many records and probably take a very long time. Check your WHERE and use SET OPTION SQL_BIG_SELECTS=1 if the SELECT is ok
+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
 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;
+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;
+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;
+a	b
+3	a
+2	test2
+4	a
+5	a
+SET MAX_JOIN_SIZE=2;
+SELECT * from t1;
+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 MAX_JOIN_SIZE=DEFAULT;
+SELECT * from t1;
+a	b
+3	a
+2	test2
+4	a
+5	a
 drop table t1;
 SET SQL_SAFE_UPDATES=0,SQL_SELECT_LIMIT=DEFAULT, SQL_MAX_JOIN_SIZE=DEFAULT;