summaryrefslogtreecommitdiff
path: root/sql/share/japanese
diff options
context:
space:
mode:
authorunknown <paul@teton.kitebird.com>2003-06-26 11:04:20 -0500
committerunknown <paul@teton.kitebird.com>2003-06-26 11:04:20 -0500
commit608bda36516204db01fac9266db6d2d4ab749d67 (patch)
tree31bf6126006330261f64827358475cf4088a5cbc /sql/share/japanese
parent1d29092e2dded4d0081932759944de0e5ea3c2a6 (diff)
parent774e3a594b94c16e4f9eb474abeae33849c8b077 (diff)
downloadmariadb-git-608bda36516204db01fac9266db6d2d4ab749d67.tar.gz
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into teton.kitebird.com:/home/paul/mysql-4.1 sql/share/czech/errmsg.txt: Auto merged sql/share/danish/errmsg.txt: Auto merged sql/share/dutch/errmsg.txt: Auto merged sql/share/english/errmsg.txt: Auto merged sql/share/estonian/errmsg.txt: Auto merged sql/share/french/errmsg.txt: Auto merged sql/share/german/errmsg.txt: Auto merged sql/share/greek/errmsg.txt: Auto merged sql/share/hungarian/errmsg.txt: Auto merged sql/share/italian/errmsg.txt: Auto merged sql/share/japanese/errmsg.txt: Auto merged sql/share/korean/errmsg.txt: Auto merged sql/share/norwegian-ny/errmsg.txt: Auto merged sql/share/norwegian/errmsg.txt: Auto merged sql/share/polish/errmsg.txt: Auto merged sql/share/portuguese/errmsg.txt: Auto merged sql/share/romanian/errmsg.txt: Auto merged sql/share/russian/errmsg.txt: Auto merged sql/share/serbian/errmsg.txt: Auto merged sql/share/slovak/errmsg.txt: Auto merged sql/share/spanish/errmsg.txt: Auto merged sql/share/swedish/errmsg.txt: Auto merged sql/share/ukrainian/errmsg.txt: Auto merged
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 a9aa0747a59..417a03978fb 100644
--- a/sql/share/japanese/errmsg.txt
+++ b/sql/share/japanese/errmsg.txt
@@ -252,7 +252,7 @@
"Every derived table must have it's own alias",
"Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s",
-"Client does not support authentication protocol requested by server. Consider upgrading MySQL client",
+"Client does not support authentication protocol requested by server; consider upgrading MySQL client",
"All parts of a SPATIAL KEY must be NOT NULL",
"COLLATION '%s' is not valid for CHARACTER SET '%s'",
"The slave was already running",