summaryrefslogtreecommitdiff
path: root/sql/share/japanese/errmsg.txt
diff options
context:
space:
mode:
authorunknown <bell@sanja.is.com.ua>2004-10-04 13:56:48 +0300
committerunknown <bell@sanja.is.com.ua>2004-10-04 13:56:48 +0300
commitfaea84119ba2779ed76e91e44af0928919868442 (patch)
tree2339a9b67770ece89b7e96ac64db90238c5d64f9 /sql/share/japanese/errmsg.txt
parent99bf885bf5044d99d0597f5e177162c851e32359 (diff)
parent50cc3e4ab0765fb987b739fdf163e4e1a609fd76 (diff)
downloadmariadb-git-faea84119ba2779ed76e91e44af0928919868442.tar.gz
merge
sql/sql_class.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_update.cc: Auto merged sql/table.cc: Auto merged
Diffstat (limited to 'sql/share/japanese/errmsg.txt')
-rw-r--r--sql/share/japanese/errmsg.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt
index 67de9337ff5..48c18922694 100644
--- a/sql/share/japanese/errmsg.txt
+++ b/sql/share/japanese/errmsg.txt
@@ -387,3 +387,5 @@ character-set=ujis
"Field '%-.64s' doesn't have a default value",
"Division by 0",
"Incorrect %-.32s value: '%-.128s' for column '%.64s' at row %ld",
+"CHECK OPTION on non-updatable view '%-.64s.%-.64s'"
+"CHECK OPTION failed '%-.64s.%-.64s'"