summaryrefslogtreecommitdiff
path: root/sql/share/japanese
diff options
context:
space:
mode:
authorunknown <monty@narttu.mysql.fi>2003-04-24 09:18:53 +0300
committerunknown <monty@narttu.mysql.fi>2003-04-24 09:18:53 +0300
commitcdf3e090e5d1cd9a0aaf17dba52acf39abdfe1a1 (patch)
tree57d70a14e61d4b62cd99af160559844439fde224 /sql/share/japanese
parent81a83ca8b667f16c7fd40e666ac26c251b2b87de (diff)
downloadmariadb-git-cdf3e090e5d1cd9a0aaf17dba52acf39abdfe1a1.tar.gz
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
Diffstat (limited to 'sql/share/japanese')
-rw-r--r--sql/share/japanese/errmsg.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt
index f9c1645419d..1b04ee5c2e4 100644
--- a/sql/share/japanese/errmsg.txt
+++ b/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'",