Language/consistency edits to error messages

and affected test results.

1 files changed, 21 insertions, 21 deletions

diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt
index 094622a49cd..35ac3594a67 100644
--- a/sql/share/japanese/errmsg.txt
+++ b/sql/share/japanese/errmsg.txt
@@ -50,7 +50,7 @@ character-set=ujis
 "その address の hostname が引けません.",
 "Bad handshake",
 "ユーザー '%-.32s'@'%-.64s' の '%-.64s' データベースへのアクセスを拒否します",
-"ユーザー '%-.32s'@'%-.64s' を拒否します.(Using password: %s)",
+"ユーザー '%-.32s'@'%-.64s' を拒否します.uUsing password: %s)",
 "データベースが選択されていません.",
 "そのコマンドは何？",
 "Column '%-.64s' は null にはできないのです",
@@ -80,7 +80,7 @@ character-set=ujis
 "Key column '%-.64s' がテーブルにありません.",
 "BLOB column '%-.64s' can't be used in key specification with the used table type",
 "column '%-.64s' は,確保する column の大きさが多すぎます. (最大 %d まで). BLOB をかわりに使用してください.",
-"テーブルの定義が違います; There can only be one auto column and it must be defined as a key",
+"テーブルの定義が違います; there can be only one auto column and it must be defined as a key",
 "%s: 準備完了\n",
 "%s: Normal shutdown\n",
 "%s: Got signal %d. 中断!\n",
@@ -88,15 +88,15 @@ character-set=ujis
 "%s: スレッド %ld 強制終了  user: '%-.64s'\n",
 "IP socket が作れません",
 "Table '%-.64s' はそのような index を持っていません(CREATE INDEX 実行時に指定されていません). テーブルを作り直してください",
-"Field separator argument is not what is expected. Check the manual",
-"You can't use fixed rowlength with BLOBs. Please use 'fields terminated by'.",
+"Field separator argument is not what is expected; check the manual",
+"You can't use fixed rowlength with BLOBs; please use 'fields terminated by'.",
 "ファイル '%-.64s' は databse の directory にあるか全てのユーザーが読めるように許可されていなければなりません.",
 "File '%-.64s' は既に存在します",
 "レコード数: %ld  削除: %ld  Skipped: %ld  Warnings: %ld",
 "レコード数: %ld  重複: %ld",
 "Incorrect sub part key. The used key part isn't a string or the used length is longer than the key part",
 "ALTER TABLE で全ての column は削除できません. DROP TABLE を使用してください",
-"'%-.64s' を破棄できませんでした. Check that column/key exists",
+"'%-.64s' を破棄できませんでした; check that column/key exists",
 "レコード数: %ld  重複数: %ld  Warnings: %ld",
 "You can't specify target table '%-.64s' for update in FROM clause",
 "thread id: %lu はありません",
@@ -109,7 +109,7 @@ character-set=ujis
 "BLOB column '%-.64s' can't have a default value",
 "指定した database 名 '%-.100s' が間違っています",
 "指定した table 名 '%-.100s' はまちがっています",
-"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",
+"The SELECT would examine more than MAX_JOIN_SIZE rows; check your WHERE and use SET SQL_BIG_SELECTS=1 or SET SQL_MAX_JOIN_SIZE=# if the SELECT is okay",
 "Unknown error",
 "Unknown procedure '%-.64s'",
 "Incorrect parameter count to procedure '%-.64s'",
@@ -121,11 +121,11 @@ character-set=ujis
 "テーブルは最低 1 個の column が必要です",
 "table '%-.64s' はいっぱいです",
 "character set '%-.64s' はサポートしていません",
-"テーブルが多すぎます. MySQL can only use %d tables in a join",
+"テーブルが多すぎます; MySQL can only use %d tables in a join",
 "column が多すぎます",
 "row size が大きすぎます. BLOB を含まない場合の row size の最大は %d です. いくつかの field を BLOB に変えてください.",
 "Thread stack overrun:  Used: %ld of a %ld stack.  スタック領域を多くとりたい場合、'mysqld -O thread_stack=#' と指定してください",
-"Cross dependency found in OUTER JOIN.  Examine your ON conditions",
+"Cross dependency found in OUTER JOIN; examine your ON conditions",
 "Column '%-.64s' が UNIQUE か INDEX で使用されました. このカラムは NOT NULL と定義されていません.",
 "function '%-.64s' を ロードできません",
 "function '%-.64s' を初期化できません; %-.80s",
@@ -145,11 +145,11 @@ character-set=ujis
 "Can't reopen table: '%-.64s'",
 "NULL 値の使用方法が不適切です",
 "Got error '%-.64s' from regexp",
-"Mixing of GROUP columns (MIN(),MAX(),COUNT()...) with no GROUP columns is illegal if there is no GROUP BY clause",
+"Mixing of GROUP columns (MIN(),MAX(),COUNT(),...) with no GROUP columns is illegal if there is no GROUP BY clause",
 "ユーザー '%-.32s' (ホスト '%-.64s' のユーザー) は許可されていません",
 "コマンド %-.16s は ユーザー '%-.32s'@'%-.64s' ,テーブル '%-.64s' に対して許可されていません",
 "コマンド %-.16s は ユーザー '%-.32s'@'%-.64s'\n カラム '%-.64s' テーブル '%-.64s' に対して許可されていません",
-"Illegal GRANT/REVOKE command. Please consult the manual which privleges can be used.",
+"Illegal GRANT/REVOKE command; please consult the manual to see which privleges can be used.",
 "The host or user argument to GRANT is too long",
 "Table '%-.64s.%s' doesn't exist",
 "There is no such grant defined for user '%-.32s' on host '%-.64s' on table '%-.64s'",
@@ -176,7 +176,7 @@ character-set=ujis
 "All tables in the MERGE table are not defined identically",
 "Can't write, because of unique constraint, to table '%-.64s'",
 "BLOB column '%-.64s' used in key specification without a key length",
-"All parts of a PRIMARY KEY must be NOT NULL;  If you need NULL in a key, use UNIQUE instead",
+"All parts of a PRIMARY KEY must be NOT NULL; if you need NULL in a key, use UNIQUE instead",
 "Result consisted of more than one row",
 "This table type requires a primary key",
 "This version of MySQL is not compiled with RAID support",
@@ -255,21 +255,21 @@ character-set=ujis
 "Reference '%-.64s' not supported (%s)",
 "Every derived table must have its own alias",
 "Select %u was reduced during optimization",
-"Table '%-.64s' from one of SELECTs can not be used in %-.32s",
+"Table '%-.64s' from one of the SELECTs cannot be used in %-.32s",
 "Client does not support authentication protocol requested by server; consider upgrading MySQL client",
-"All parts of a SPATIAL KEY must be NOT NULL",
+"All parts of a SPATIAL index must be NOT NULL",
 "COLLATION '%s' is not valid for CHARACTER SET '%s'",
 "Slave is already running",
 "Slave has already been stopped",
 "Uncompressed data size too large; the maximum size is %d (probably, length of uncompressed data was corrupted)",
-"Z_MEM_ERROR: Not enough memory available for zlib",
-"Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
-"Z_DATA_ERROR: Input data was corrupted for zlib",
-"%d line(s) was(were) cut by group_concat()",
+"ZLIB: Not enough memory",
+"ZLIB: Not enough room in the output buffer (probably, length of uncompressed data was corrupted)",
+"ZLIB: Input data corrupted",
+"%d line(s) were cut by GROUP_CONCAT()",
 "Row %ld doesn't contain data for all columns",
 "Row %ld was truncated; it contained more data than there were input columns",
-"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
-"Data truncated, out of range for column '%s' at row %ld",
+"Data truncated; NULL supplied to NOT NULL column '%s' at row %ld",
+"Data truncated; out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
 "Using storage engine %s for table '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
@@ -277,7 +277,7 @@ character-set=ujis
 "Can't revoke all privileges, grant for one or more of the requested users",
 "Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
 "Illegal mix of collations for operation '%s'",
-"Variable '%-.64s' is not a variable component (Can't be used as XXXX.variable_name)",
+"Variable '%-.64s' is not a variable component (can't be used as XXXX.variable_name)",
 "Unknown collation: '%-.64s'",
 "SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support; they can be used later if MySQL slave with SSL is started",
 "Server is running in --secure-auth mode, but '%s'@'%s' has a password in the old format; please change the password to the new format",
@@ -299,7 +299,7 @@ character-set=ujis
 "Column '%-.100s' has duplicated value '%-.64s' in %s"
 "Truncated wrong %-.32s value: '%-.128s'"
 "Incorrect table definition; There can only be one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
-"Invalid ON UPDATE clause for '%-.64s' field",
+"Invalid ON UPDATE clause for '%-.64s' column",
 "This command is not supported in the prepared statement protocol yet",
 "Got NDB error %d '%-.100s'",
 "Got temporary NDB error %d '%-.100s'",