bk commit into 4.0 tree (1.1469)

Below is the list of changes that have just been committed into a local
4.0 repository of monty. When monty 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://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1469 03/04/24 09:18:53 monty@xxxxxxxxxxxxxxx +24 -0
  Fixed bug in SET SQL_BIG_SELECTS

  sql/share/ukrainian/errmsg.txt
    1.19 03/04/24 09:18:51 monty@xxxxxxxxxxxxxxx +1 -1
    Updated error messages

  sql/share/swedish/errmsg.txt
    1.55 03/04/24 09:18:51 monty@xxxxxxxxxxxxxxx +1 -1
    Updated error messages

  sql/share/spanish/errmsg.txt
    1.55 03/04/24 09:18:51 monty@xxxxxxxxxxxxxxx +1 -1
    Updated error messages

  sql/share/slovak/errmsg.txt
    1.54 03/04/24 09:18:51 monty@xxxxxxxxxxxxxxx +1 -1
    Updated error messages

  sql/share/russian/errmsg.txt
    1.54 03/04/24 09:18:51 monty@xxxxxxxxxxxxxxx +1 -1
    Updated error messages

  sql/share/romanian/errmsg.txt
    1.52 03/04/24 09:18:51 monty@xxxxxxxxxxxxxxx +1 -1
    Updated error messages

  sql/share/portuguese/errmsg.txt
    1.56 03/04/24 09:18:51 monty@xxxxxxxxxxxxxxx +1 -1
    Updated error messages

  sql/share/norwegian/errmsg.txt
    1.53 03/04/24 09:18:51 monty@xxxxxxxxxxxxxxx +1 -1
    Updated error messages

  sql/share/norwegian-ny/errmsg.txt
    1.53 03/04/24 09:18:51 monty@xxxxxxxxxxxxxxx +1 -1
    Updated error messages

  sql/share/korean/errmsg.txt
    1.53 03/04/24 09:18:51 monty@xxxxxxxxxxxxxxx +1 -1
    Updated error messages

  sql/share/japanese/errmsg.txt
    1.53 03/04/24 09:18:51 monty@xxxxxxxxxxxxxxx +1 -1
    Updated error messages

  sql/share/italian/errmsg.txt
    1.61 03/04/24 09:18:51 monty@xxxxxxxxxxxxxxx +1 -1
    Updated error messages

  sql/share/hungarian/errmsg.txt
    1.55 03/04/24 09:18:51 monty@xxxxxxxxxxxxxxx +1 -1
    Updated error messages

  sql/share/greek/errmsg.txt
    1.54 03/04/24 09:18:51 monty@xxxxxxxxxxxxxxx +1 -1
    Updated error messages

  sql/share/german/errmsg.txt
    1.55 03/04/24 09:18:51 monty@xxxxxxxxxxxxxxx +1 -1
    Updated error messages

  sql/share/french/errmsg.txt
    1.54 03/04/24 09:18:51 monty@xxxxxxxxxxxxxxx +1 -1
    Updated error messages

  sql/share/estonian/errmsg.txt
    1.55 03/04/24 09:18:51 monty@xxxxxxxxxxxxxxx +1 -1
    Updated error messages

  sql/share/english/errmsg.txt
    1.64 03/04/24 09:18:51 monty@xxxxxxxxxxxxxxx +1 -1
    Updated error messages

  sql/share/dutch/errmsg.txt
    1.60 03/04/24 09:18:51 monty@xxxxxxxxxxxxxxx +1 -1
    Updated error messages

  sql/share/danish/errmsg.txt
    1.53 03/04/24 09:18:51 monty@xxxxxxxxxxxxxxx +1 -1
    Updated error messages

  sql/share/czech/errmsg.txt
    1.54 03/04/24 09:18:51 monty@xxxxxxxxxxxxxxx +1 -1
    Updated error messages

  sql/set_var.cc
    1.25 03/04/24 09:18:51 monty@xxxxxxxxxxxxxxx +1 -1
    Fixed bug in SQL_BIG_SELECTS

  mysql-test/t/select_safe.test
    1.4 03/04/24 09:18:51 monty@xxxxxxxxxxxxxxx +29 -7
    Added test for SQL_BIG_SELECTS

  mysql-test/r/select_safe.result
    1.5 03/04/24 09:18:51 monty@xxxxxxxxxxxxxxx +26 -2
    Updated results

# 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: monty
# Host: narttu.mysql.fi
# Root: /my/mysql-4.0

--- 1.53/sql/share/czech/errmsg.txt     Wed Feb 26 00:22:33 2003
+++ 1.54/sql/share/czech/errmsg.txt     Thu Apr 24 09:18:51 2003
@@ -114,7 +114,7 @@
 "Blob polo-B¾ka '%-.64s' nemù¾e mít defaultní hodnotu",
 "Nep-Bøípustné jméno databáze '%-.64s'",
 "Nep-Bøípustné jméno tabulky '%-.64s'",
-"Zadan-Bý SELECT by procházel pøíli¹ mnoho záznamù a trval velmi dlouho. 
Zkontrolujte tvar WHERE a je-li SELECT v poøádku, pou¾ijte SET OPTION 
SQL_BIG_SELECTS=1",
+"Zadan-Bý SELECT by procházel pøíli¹ mnoho záznamù a trval velmi dlouho. 
Zkontrolujte tvar WHERE a je-li SELECT v poøádku, pou¾ijte SET 
SQL_BIG_SELECTS=1",
 "Nezn-Bámá chyba",
 "Nezn-Bámá procedura %s",
 "Chybn-Bý poèet parametrù procedury %s",

--- 1.52/sql/share/danish/errmsg.txt    Wed Feb 26 00:22:33 2003
+++ 1.53/sql/share/danish/errmsg.txt    Thu Apr 24 09:18:51 2003
@@ -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",

--- 1.59/sql/share/dutch/errmsg.txt     Wed Feb 26 00:22:33 2003
+++ 1.60/sql/share/dutch/errmsg.txt     Thu Apr 24 09:18:51 2003
@@ -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",

--- 1.63/sql/share/english/errmsg.txt   Wed Feb 26 00:14:17 2003
+++ 1.64/sql/share/english/errmsg.txt   Thu Apr 24 09:18:51 2003
@@ -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'",

--- 1.54/sql/share/estonian/errmsg.txt  Wed Feb 26 00:22:33 2003
+++ 1.55/sql/share/estonian/errmsg.txt  Thu Apr 24 09:18:51 2003
@@ -110,7 +110,7 @@
 "BLOB-tüüpi tulp '%-.64s' ei saa omada vaikeväärtust",
 "Vigane andmebaasi nimi '%-.100s'",
 "Vigane tabeli nimi '%-.100s'",
-"SELECT lause peab läbi vaatama suure hulga kirjeid ja võtaks tõenäoliselt 
liiga kaua aega. Tasub kontrollida WHERE klauslit ja vajadusel kasutada käsku 
SET OPTION SQL_BIG_SELECTS=1",
+"SELECT lause peab läbi vaatama suure hulga kirjeid ja võtaks tõenäoliselt 
liiga kaua aega. Tasub kontrollida WHERE klauslit ja vajadusel kasutada käsku 
SET SQL_BIG_SELECTS=1",
 "Tundmatu viga",
 "Tundmatu protseduur '%-.64s'",
 "Vale parameetrite hulk protseduurile '%-.64s'",

--- 1.53/sql/share/french/errmsg.txt    Wed Feb 26 00:14:17 2003
+++ 1.54/sql/share/french/errmsg.txt    Thu Apr 24 09:18:51 2003
@@ -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",

--- 1.54/sql/share/german/errmsg.txt    Wed Feb 26 00:14:17 2003
+++ 1.55/sql/share/german/errmsg.txt    Thu Apr 24 09:18:51 2003
@@ -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.",

--- 1.53/sql/share/greek/errmsg.txt     Wed Feb 26 00:14:17 2003
+++ 1.54/sql/share/greek/errmsg.txt     Thu Apr 24 09:18:51 2003
@@ -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'",

--- 1.54/sql/share/hungarian/errmsg.txt Wed Feb 26 00:14:17 2003
+++ 1.55/sql/share/hungarian/errmsg.txt Thu Apr 24 09:18:51 2003
@@ -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",

--- 1.60/sql/share/italian/errmsg.txt   Wed Feb 26 00:14:17 2003
+++ 1.61/sql/share/italian/errmsg.txt   Thu Apr 24 09:18:51 2003
@@ -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'",

--- 1.52/sql/share/japanese/errmsg.txt  Wed Feb 26 00:14:17 2003
+++ 1.53/sql/share/japanese/errmsg.txt  Thu Apr 24 09:18:51 2003
@@ -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'",

--- 1.52/sql/share/korean/errmsg.txt    Wed Feb 26 00:14:17 2003
+++ 1.53/sql/share/korean/errmsg.txt    Thu Apr 24 09:18:51 2003
@@ -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' ¼öÇ๮¿¡ ´ëÇÑ ºÎÁ¤È®ÇÑ ÆĶó¸ÞÅÍ",

--- 1.52/sql/share/norwegian-ny/errmsg.txt      Wed Feb 26 00:14:17 2003
+++ 1.53/sql/share/norwegian-ny/errmsg.txt      Thu Apr 24 09:18:51 2003
@@ -107,7 +107,7 @@
 "Blob feltet '%-.64s' kan ikkje ha ein standard verdi",
 "Ugyldig database namn '%-.64s'",
 "Ugyldig tabell namn '%-.64s'",
-"SELECT ville undersøkje for mange postar 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økje for mange postar og ville sannsynligvis ta veldig 
lang tid. Undersøk WHERE klausulen og bruk SET SQL_BIG_SELECTS=1 om SELECTen er 
korrekt",
 "Ukjend feil",
 "Ukjend prosedyre %s",
 "Feil parameter tal til prosedyra %s",

--- 1.52/sql/share/norwegian/errmsg.txt Wed Feb 26 00:14:17 2003
+++ 1.53/sql/share/norwegian/errmsg.txt Thu Apr 24 09:18:51 2003
@@ -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",

--- 1.55/sql/share/portuguese/errmsg.txt        Wed Feb 26 00:14:18 2003
+++ 1.56/sql/share/portuguese/errmsg.txt        Thu Apr 24 09:18:51 2003
@@ -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'",

--- 1.51/sql/share/romanian/errmsg.txt  Wed Feb 26 00:14:18 2003
+++ 1.52/sql/share/romanian/errmsg.txt  Thu Apr 24 09:18:51 2003
@@ -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",

--- 1.53/sql/share/russian/errmsg.txt   Fri Mar  7 16:22:02 2003
+++ 1.54/sql/share/russian/errmsg.txt   Thu Apr 24 09:18:51 2003
@@ -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'",

--- 1.53/sql/share/slovak/errmsg.txt    Wed Feb 26 00:14:18 2003
+++ 1.54/sql/share/slovak/errmsg.txt    Thu Apr 24 09:18:51 2003
@@ -113,7 +113,7 @@
 "Pole BLOB '%-.64s' nemô¾e ma» implicitnú hodnotu",
 "Neprípustné meno databázy '%-.100s'",
 "Neprípustné meno tabuµky '%-.100s'",
-"Zadaná po¾iadavka SELECT by prechádzala príli¹ mnoho záznamov a trvala by 
príli¹ dlho. Skontrolujte tvar WHERE a ak je v poriadku, pou¾ite SET OPTION 
SQL_BIG_SELECTS=1",
+"Zadaná po¾iadavka SELECT by prechádzala príli¹ mnoho záznamov a trvala by 
príli¹ dlho. Skontrolujte tvar WHERE a ak je v poriadku, pou¾ite SET 
SQL_BIG_SELECTS=1",
 "Neznámá chyba",
 "Neznámá procedúra '%-.64s'",
 "Chybný poèet parametrov procedúry '%-.64s'",

--- 1.54/sql/share/spanish/errmsg.txt   Wed Feb 26 00:14:18 2003
+++ 1.55/sql/share/spanish/errmsg.txt   Thu Apr 24 09:18:51 2003
@@ -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",

--- 1.54/sql/share/swedish/errmsg.txt   Wed Mar 19 15:04:28 2003
+++ 1.55/sql/share/swedish/errmsg.txt   Thu Apr 24 09:18:51 2003
@@ -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",

--- 1.4/mysql-test/r/select_safe.result Thu Oct 11 03:59:45 2001
+++ 1.5/mysql-test/r/select_safe.result Thu Apr 24 09:18:51 2003
@@ -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 @@
 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;

--- 1.3/mysql-test/t/select_safe.test   Thu Oct 11 03:59:43 2001
+++ 1.4/mysql-test/t/select_safe.test   Thu Apr 24 09:18:51 2003
@@ -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 @@
 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;

--- 1.18/sql/share/ukrainian/errmsg.txt Wed Feb 26 00:14:18 2003
+++ 1.19/sql/share/ukrainian/errmsg.txt Thu Apr 24 09:18:51 2003
@@ -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'",

--- 1.24/sql/set_var.cc Wed Mar  5 19:43:53 2003
+++ 1.25/sql/set_var.cc Thu Apr 24 09:18:51 2003
@@ -239,7 +239,7 @@
 #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);

-- 
MySQL Internals Mailing List
For list archives: http://lists.mysql.com/internals
To unsubscribe:    
http://lists.mysql.com/internals?unsub=gcdmd-internals@xxxxxxxxxxx