diff options
| author | unknown <bell@sanja.is.com.ua> | 2002-06-05 21:32:22 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2002-06-05 21:32:22 +0300 |
| commit | 954a0583f8408927184f12ef67527037e10b36d2 (patch) | |
| tree | 945cc821cedde0c371ca804a2556598b1d087da7 /sql/share/japanese | |
| parent | a532bfb2ea0a0d1cfc0c8d25e6a18cf5a8c0c5bc (diff) | |
| parent | fa86b948379ca3929ebd8a7b941d6c2fbb26f8ec (diff) | |
| download | mariadb-git-954a0583f8408927184f12ef67527037e10b36d2.tar.gz | |
merged
sql/item.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_update.cc:
Auto merged
Diffstat (limited to 'sql/share/japanese')
| -rw-r--r-- | sql/share/japanese/errmsg.txt | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt index 55fe7d79768..4016dd50189 100644 --- a/sql/share/japanese/errmsg.txt +++ b/sql/share/japanese/errmsg.txt @@ -149,7 +149,7 @@ "コマンド %-.16s は ユーザー '%-.32s@%-.64s'\n カラム '%-.64s' テーブル '%-.64s' に対して許可されていません", "Illegal GRANT/REVOKE command. Please consult the manual which privleges can be used.", "The host or user argument to GRANT is too long", -"Table '%-64s.%s' doesn't exist", +"Table '%-.64s.%s' doesn't exist", "There is no such grant defined for user '%-.32s' on host '%-.64s' on table '%-.64s'", "The used command is not allowed with this MySQL version", "Something is wrong in your syntax", @@ -196,7 +196,7 @@ "Net error writing to master", "Can't find FULLTEXT index matching the column list", "Can't execute the given command because you have active locked tables or an active transaction", -"Unknown system variable '%-.64'", +"Unknown system variable '%-.64s'", "Table '%-.64s' is marked as crashed and should be repaired", "Table '%-.64s' is marked as crashed and last (automatic?) repair failed", "Warning: Some non-transactional changed tables couldn't be rolled back", @@ -229,6 +229,8 @@ "Can't execute the query because you have a conflicting read lock", "Mixing of transactional and non-transactional tables is disabled", "Option '%s' used twice in statement", -"User '%-64s' has exceeded the '%s' resource (current value: %ld)", +"User '%-.64s' has exceeded the '%s' resource (current value: %ld)", +"Wrong foreign key definition for '%-.64s': %s", +"Key reference and table reference doesn't match", "Subselect return more than 1 field", "Subselect return more than 1 record", |