summaryrefslogtreecommitdiff
path: root/sql/share/german
diff options
context:
space:
mode:
authorunknown <monty@mishka.local>2004-10-05 01:10:23 +0300
committerunknown <monty@mishka.local>2004-10-05 01:10:23 +0300
commit45a7c6581fa89f638d09e4063341d138679ce1f4 (patch)
tree61d4fef7b2a5c71ac7fff85c77ebd1a8d090e8d1 /sql/share/german
parentfaea84119ba2779ed76e91e44af0928919868442 (diff)
parentc7cf529f32b64447b389131eb61a6f8879eb4d82 (diff)
downloadmariadb-git-45a7c6581fa89f638d09e4063341d138679ce1f4.tar.gz
merge
mysql-test/r/sp.result: Auto merged sql/sql_insert.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_update.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/table.cc: Auto merged
Diffstat (limited to 'sql/share/german')
-rw-r--r--sql/share/german/errmsg.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/share/german/errmsg.txt b/sql/share/german/errmsg.txt
index e3fe33960b1..ff797119971 100644
--- a/sql/share/german/errmsg.txt
+++ b/sql/share/german/errmsg.txt
@@ -396,5 +396,6 @@ character-set=latin1
"Field '%-.64s' doesn't have a default value",
"Division by 0",
"Incorrect %-.32s value: '%-.128s' for column '%.64s' at row %ld",
+"Illegal %s '%-.64s' value found during parsing",
"CHECK OPTION on non-updatable view '%-.64s.%-.64s'"
"CHECK OPTION failed '%-.64s.%-.64s'"