Fixed bug in SET SQL_BIG_SELECTS

mysql-test/r/select_safe.result

 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;

mysql-test/t/select_safe.test

@@ -4,7 +4,7 @@
 
 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;
 update t1 set b="a" where a=1;
@@ -15,18 +15,40 @@ update t1 set b="a" where a=1;
 select 1 from t1,t1 as t2,t1 as t3,t1 as t4;
 
 # The following should give errors:
-!$1175 update t1 set b="a";
-!$1175 update t1 set b="a" where b="test";
-!$1175 delete from t1;
-!$1175 delete from t1 where b="test";
-!$1175 delete from t1 where a+0=1;
-!$1104 select 1 from t1,t1 as t2,t1 as t3,t1 as t4,t1 as t5;
+--error 1175
+update t1 set b="a";
+--error 1175
+update t1 set b="a" where b="test";
+--error 1175
+delete from t1;
+--error 1175
+delete from t1 where b="test";
+--error 1175
+delete from t1 where a+0=1;
+--error 1104
+select 1 from t1,t1 as t2,t1 as t3,t1 as t4,t1 as t5;
 
 # The following should be 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;
+
+# Test SQL_BIG_SELECTS
+
+SET MAX_JOIN_SIZE=2;
+SELECT @@MAX_JOIN_SIZE, @@SQL_BIG_SELECTS;
+insert into t1 values (null,"a"),(null,"a"),(null,"a"),(null,"a"),(null,"a"),(null,"a"),(null,"a"),(null,"a"),(null,"a"),(null,"a");
+--error 1104
+SELECT * from t1;
+SET SQL_BIG_SELECTS=1;
+SELECT * from t1;
+SET MAX_JOIN_SIZE=2;
+--error 1104
+SELECT * from t1;
+SET MAX_JOIN_SIZE=DEFAULT;
+SELECT * from t1;
+
 drop table t1;
 
 SET SQL_SAFE_UPDATES=0,SQL_SELECT_LIMIT=DEFAULT, SQL_MAX_JOIN_SIZE=DEFAULT;

sql/set_var.cc

@@ -239,7 +239,7 @@ static sys_var_thd_bit	sys_sql_big_tables("sql_big_tables",
 #endif
 static sys_var_thd_bit	sys_big_selects("sql_big_selects",
 					set_option_bit,
-					OPTION_BIG_TABLES);
+					OPTION_BIG_SELECTS);
 static sys_var_thd_bit	sys_log_off("sql_log_off",
 				    set_option_bit,
 				    OPTION_LOG_OFF);

sql/share/czech/errmsg.txt

@@ -114,7 +114,7 @@
 "Blob polo-Bka '%-.64s' neme mt defaultn hodnotu",
 "Nep-Bpustn jmno databze '%-.64s'",
 "Nep-Bpustn jmno tabulky '%-.64s'",
-"Zadan-B SELECT by prochzel pli mnoho zznam a trval velmi dlouho. Zkontrolujte tvar WHERE a je-li SELECT v podku, pouijte SET OPTION SQL_BIG_SELECTS=1",
+"Zadan-B SELECT by prochzel pli mnoho zznam a trval velmi dlouho. Zkontrolujte tvar WHERE a je-li SELECT v podku, pouijte SET SQL_BIG_SELECTS=1",
 "Nezn-Bm chyba",
 "Nezn-Bm procedura %s",
 "Chybn-B poet parametr procedury %s",

sql/share/danish/errmsg.txt

@@ -108,7 +108,7 @@
 "BLOB feltet '%-.64s' kan ikke have en standard værdi",
 "Ugyldigt database navn '%-.64s'",
 "Ugyldigt tabel navn '%-.64s'",
-"SELECT ville undersøge for mange poster og ville sandsynligvis tage meget lang tid. Undersøg WHERE delen og brug SET OPTION SQL_BIG_SELECTS=1 hvis udtrykket er korrekt",
+"SELECT ville undersøge for mange poster og ville sandsynligvis tage meget lang tid. Undersøg WHERE delen og brug SET SQL_BIG_SELECTS=1 hvis udtrykket er korrekt",
 "Ukendt fejl",
 "Ukendt procedure %s",
 "Forkert antal  parametre til proceduren %s",

sql/share/dutch/errmsg.txt

@@ -116,7 +116,7 @@
 "Blob veld '%-.64s' can geen standaardwaarde bevatten",
 "Databasenaam '%-.64s' is niet getoegestaan",
 "Niet toegestane tabelnaam '%-.64s'",
-"Het SELECT-statement zou te veel records analyseren en dus veel tijd in beslagnemen. Kijk het WHERE-gedeelte van de query na en kies SET OPTION SQL_BIG_SELECTS=1 als het stament in orde is.",
+"Het SELECT-statement zou te veel records analyseren en dus veel tijd in beslagnemen. Kijk het WHERE-gedeelte van de query na en kies SET SQL_BIG_SELECTS=1 als het stament in orde is.",
 "Onbekende Fout",
 "Onbekende procedure %s",
 "Foutief aantal parameters doorgegeven aan procedure %s",

sql/share/english/errmsg.txt

@@ -105,7 +105,7 @@
 "BLOB column '%-.64s' can't have a default value",
 "Incorrect database name '%-.100s'",
 "Incorrect table name '%-.100s'",
-"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",
 "Unknown error",
 "Unknown procedure '%-.64s'",
 "Incorrect parameter count to procedure '%-.64s'",

sql/share/estonian/errmsg.txt

@@ -110,7 +110,7 @@
 "BLOB-tpi tulp '%-.64s' ei saa omada vaikevrtust",
 "Vigane andmebaasi nimi '%-.100s'",
 "Vigane tabeli nimi '%-.100s'",
-"SELECT lause peab lbi vaatama suure hulga kirjeid ja vtaks tenoliselt liiga kaua aega. Tasub kontrollida WHERE klauslit ja vajadusel kasutada ksku SET OPTION SQL_BIG_SELECTS=1",
+"SELECT lause peab lbi vaatama suure hulga kirjeid ja vtaks tenoliselt liiga kaua aega. Tasub kontrollida WHERE klauslit ja vajadusel kasutada ksku SET SQL_BIG_SELECTS=1",
 "Tundmatu viga",
 "Tundmatu protseduur '%-.64s'",
 "Vale parameetrite hulk protseduurile '%-.64s'",

sql/share/french/errmsg.txt

@@ -105,7 +105,7 @@
 "BLOB '%-.64s' ne peut avoir de valeur par défaut",
 "Nom de base de donnée illégal: '%-.64s'",
 "Nom de table illégal: '%-.64s'",
-"SELECT va devoir examiner beaucoup d'enregistrements ce qui va prendre du temps. Vérifiez la clause WHERE et utilisez SET OPTION SQL_BIG_SELECTS=1 si SELECT se passe bien",
+"SELECT va devoir examiner beaucoup d'enregistrements ce qui va prendre du temps. Vérifiez la clause WHERE et utilisez SET SQL_BIG_SELECTS=1 si SELECT se passe bien",
 "Erreur inconnue",
 "Procédure %s inconnue",
 "Mauvais nombre de paramètres pour la procedure %s",

sql/share/german/errmsg.txt

@@ -108,7 +108,7 @@
 "BLOB-Feld '%-.64s' kann keinen Vorgabewert (Default-Value) besitzen.",
 "Unerlaubter Datenbankname '%-.64s'.",
 "Unerlaubter Tabellenname '%-.64s'.",
-"Die Ausführung des SELECT würde zu viele Datensätze untersuchen und wahrscheinlich sehr lange daueren. Bitte WHERE überprüfen und SET OPTION SQL_BIG_SELECTS=1 verwenden, sofern SELECT ok ist.",
+"Die Ausführung des SELECT würde zu viele Datensätze untersuchen und wahrscheinlich sehr lange daueren. Bitte WHERE überprüfen und SET SQL_BIG_SELECTS=1 verwenden, sofern SELECT ok ist.",
 "Unbekannter Fehler.",
 "Unbekannte Procedure %-.64s.",
 "Falsche Parameterzahl für Procedure %-.64s.",

sql/share/greek/errmsg.txt

@@ -105,7 +105,7 @@
 " Blob  '%-.64s'       (default value)",
 "    '%-.100s'",
 "   '%-.100s'",
-" SELECT         .      WHERE   SET OPTION SQL_BIG_SELECTS=1   SELECT  ",
+" SELECT         .      WHERE   SET SQL_BIG_SELECTS=1   SELECT  ",
 "  ",
 "  '%-.64s'",
 "     '%-.64s'",

sql/share/hungarian/errmsg.txt

@@ -107,7 +107,7 @@
 "A(z) '%-.64s' blob objektumnak nem lehet alapertelmezett erteke",
 "Hibas adatbazisnev: '%-.100s'",
 "Hibas tablanev: '%-.100s'",
-"A SELECT tul sok rekordot fog megvizsgalni es nagyon sokaig fog tartani. Ellenorizze a WHERE-t es hasznalja a SET OPTION SQL_BIG_SELECTS=1 beallitast, ha a SELECT ok",
+"A SELECT tul sok rekordot fog megvizsgalni es nagyon sokaig fog tartani. Ellenorizze a WHERE-t es hasznalja a SET SQL_BIG_SELECTS=1 beallitast, ha a SELECT ok",
 "Ismeretlen hiba",
 "Ismeretlen eljaras: '%-.64s'",
 "Rossz parameter a(z) '%-.64s'eljaras szamitasanal",

sql/share/italian/errmsg.txt

@@ -105,7 +105,7 @@
 "Il campo BLOB '%-.64s' non puo` avere un valore di default",
 "Nome database errato '%-.100s'",
 "Nome tabella errato '%-.100s'",
-"La SELECT dovrebbe esaminare troppi record e usare troppo tempo. Controllare la WHERE e usa SET OPTION SQL_BIG_SELECTS=1 se e` tutto a posto.",
+"La SELECT dovrebbe esaminare troppi record e usare troppo tempo. Controllare la WHERE e usa SET SQL_BIG_SELECTS=1 se e` tutto a posto.",
 "Errore sconosciuto",
 "Procedura '%-.64s' sconosciuta",
 "Numero di parametri errato per la procedura '%-.64s'",

sql/share/japanese/errmsg.txt

@@ -107,7 +107,7 @@
 "BLOB column '%-.64s' can't have a default value",
 "指定した database 名 '%-.100s' が間違っています",
 "指定した table 名 '%-.100s' はまちがっています",
-"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",
 "Unknown error",
 "Unknown procedure '%-.64s'",
 "Incorrect parameter count to procedure '%-.64s'",

sql/share/korean/errmsg.txt

@@ -105,7 +105,7 @@
 "BLOB 칼럼 '%-.64s' 는 디폴트 값을 가질 수 없습니다.",
 "'%-.100s' 데이타베이스의 이름이 부정확합니다.",
 "'%-.100s' 테이블 이름이 부정확합니다.",
-"SELECT 명령에서 너무 많은 레코드를 찾기 때문에 많은 시간이 소요됩니다. 따라서 WHERE 문을 점검하거나, 만약 SELECT가 ok되면  SET OPTION SQL_BIG_SELECTS=1 옵션을 사용하세요.",
+"SELECT 명령에서 너무 많은 레코드를 찾기 때문에 많은 시간이 소요됩니다. 따라서 WHERE 문을 점검하거나, 만약 SELECT가 ok되면  SET SQL_BIG_SELECTS=1 옵션을 사용하세요.",
 "알수 없는 에러입니다.",
 "알수 없는 수행문 : '%-.64s'",
 "'%-.64s' 수행문에 대한 부정확한 파라메터",

sql/share/norwegian-ny/errmsg.txt

@@ -107,7 +107,7 @@
 "Blob feltet '%-.64s' kan ikkje ha ein standard verdi",
 "Ugyldig database namn '%-.64s'",
 "Ugyldig tabell namn '%-.64s'",
-"SELECT ville underskje for mange postar og ville sannsynligvis ta veldig lang tid. Undersk WHERE klausulen og bruk SET OPTION SQL_BIG_SELECTS=1 om SELECTen er korrekt",
+"SELECT ville underskje for mange postar og ville sannsynligvis ta veldig lang tid. Undersk WHERE klausulen og bruk SET SQL_BIG_SELECTS=1 om SELECTen er korrekt",
 "Ukjend feil",
 "Ukjend prosedyre %s",
 "Feil parameter tal til prosedyra %s",

sql/share/norwegian/errmsg.txt

@@ -107,7 +107,7 @@
 "Blob feltet '%-.64s' kan ikke ha en standard verdi",
 "Ugyldig database navn '%-.64s'",
 "Ugyldig tabell navn '%-.64s'",
-"SELECT ville undersøke for mange poster og ville sannsynligvis ta veldig lang tid. Undersøk WHERE klausulen og bruk SET OPTION SQL_BIG_SELECTS=1 om SELECTen er korrekt",
+"SELECT ville undersøke for mange poster og ville sannsynligvis ta veldig lang tid. Undersøk WHERE klausulen og bruk SET SQL_BIG_SELECTS=1 om SELECTen er korrekt",
 "Ukjent feil",
 "Ukjent prosedyre %s",
 "Feil parameter antall til prosedyren %s",

sql/share/portuguese/errmsg.txt

@@ -105,7 +105,7 @@
 "Coluna BLOB '%-.64s' não pode ter um valor padrão (default)",
 "Nome de banco de dados '%-.100s' incorreto",
 "Nome de tabela '%-.100s' incorreto",
-"O SELECT examinaria registros demais e provavelmente levaria muito tempo. Cheque sua cláusula WHERE e use SET OPTION SQL_BIG_SELECTS=1, se o SELECT estiver correto",
+"O SELECT examinaria registros demais e provavelmente levaria muito tempo. Cheque sua cláusula WHERE e use SET SQL_BIG_SELECTS=1, se o SELECT estiver correto",
 "Erro desconhecido",
 "'Procedure' '%-.64s' desconhecida",
 "Número de parâmetros incorreto para a 'procedure' '%-.64s'",

sql/share/romanian/errmsg.txt

@@ -109,7 +109,7 @@
 "Coloana BLOB '%-.64s' nu poate avea o valoare default",
 "Numele bazei de date este incorect '%-.100s'",
 "Numele tabelei este incorect '%-.100s'",
-"SELECT-ul ar examina prea multe cimpuri si probabil ar lua prea mult timp. Verifica clauza WHERE si foloseste SET OPTION SQL_BIG_SELECTS=1 daca SELECT-ul e ok",
+"SELECT-ul ar examina prea multe cimpuri si probabil ar lua prea mult timp. Verifica clauza WHERE si foloseste SET SQL_BIG_SELECTS=1 daca SELECT-ul e ok",
 "Eroare unknown",
 "Procedura unknown '%-.64s'",
 "Procedura '%-.64s' are un numar incorect de parametri",

sql/share/russian/errmsg.txt

@@ -107,7 +107,7 @@
 "       BLOB '%-.64s'",
 "    '%-.100s'",
 "   '%-.100s'",
-"   SELECT       , ,     .    WHERE, ,      ,  SET OPTION SQL_BIG_SELECTS=1",
+"   SELECT       , ,     .    WHERE, ,      ,  SET SQL_BIG_SELECTS=1",
 " ",
 "  '%-.64s'",
 "     '%-.64s'",

sql/share/slovak/errmsg.txt

@@ -113,7 +113,7 @@
 "Pole BLOB '%-.64s' neme ma implicitn hodnotu",
 "Neprpustn meno databzy '%-.100s'",
 "Neprpustn meno tabuky '%-.100s'",
-"Zadan poiadavka SELECT by prechdzala prli mnoho zznamov a trvala by prli dlho. Skontrolujte tvar WHERE a ak je v poriadku, pouite SET OPTION SQL_BIG_SELECTS=1",
+"Zadan poiadavka SELECT by prechdzala prli mnoho zznamov a trvala by prli dlho. Skontrolujte tvar WHERE a ak je v poriadku, pouite SET SQL_BIG_SELECTS=1",
 "Neznm chyba",
 "Neznm procedra '%-.64s'",
 "Chybn poet parametrov procedry '%-.64s'",

sql/share/spanish/errmsg.txt

@@ -106,7 +106,7 @@
 "Campo Blob '%-.64s' no puede tener valores patron",
 "Nombre de base de datos ilegal '%-.64s'",
 "Nombre de tabla ilegal '%-.64s'",
-"El SELECT puede examinar muchos registros y probablemente con mucho tiempo. Verifique tu WHERE y usa SET OPTION SQL_BIG_SELECTS=1 si el SELECT esta correcto",
+"El SELECT puede examinar muchos registros y probablemente con mucho tiempo. Verifique tu WHERE y usa SET SQL_BIG_SELECTS=1 si el SELECT esta correcto",
 "Error desconocido",
 "Procedimiento desconocido %s",
 "Equivocado parametro count para procedimiento %s",

sql/share/swedish/errmsg.txt

@@ -105,7 +105,7 @@
 "BLOB fält '%-.64s' kan inte ha ett DEFAULT-värde",
 "Felaktigt databasnamn '%-.64s'",
 "Felaktigt tabellnamn '%-.64s'",
-"Den angivna frågan skulle troligen ta mycket lång tid!  Kontrollera din WHERE och använd SET OPTION SQL_BIG_SELECTS=1 ifall du vill hantera stora joins",
+"Den angivna frågan skulle läsa mer än MAX_JOIN_SIZE rader.  Kontrollera din WHERE och använd SET SQL_BIG_SELECTS=1 eller SET MAX_JOIN_SIZE=# ifall du vill hantera stora joins",
 "Oidentifierat fel",
 "Okänd procedur: %s",
 "Felaktigt antal parametrar till procedur %s",

sql/share/ukrainian/errmsg.txt

@@ -110,7 +110,7 @@
 " BLOB '%-.64s'      ",
 "צ '   '%-.100s'",
 "צ ' æ '%-.100s'",
-" SELECT Ҧ   Ӧ, , ,    . צ  WHERE   SET OPTION SQL_BIG_SELECTS=1,    SELECT  צ",
+" SELECT Ҧ   Ӧ, , ,    . צ  WHERE   SET SQL_BIG_SELECTS=1,    SELECT  צ",
 "צ ",
 "צ  '%-.64s'",
 " ˦˦ Ҧ  '%-.64s'",