summaryrefslogtreecommitdiff
path: root/sql/share/serbian
diff options
context:
space:
mode:
authormonty@mishka.local <>2004-10-05 01:10:23 +0300
committermonty@mishka.local <>2004-10-05 01:10:23 +0300
commit5eca078b1910140846c034d36df0e5fdde90613b (patch)
tree61d4fef7b2a5c71ac7fff85c77ebd1a8d090e8d1 /sql/share/serbian
parent9062e99ee6fab7ffaa83c141e8ff05d83c588b19 (diff)
parent0fa62b691b943b5fd0f6bba007e7b88f7681de19 (diff)
downloadmariadb-git-5eca078b1910140846c034d36df0e5fdde90613b.tar.gz
merge
Diffstat (limited to 'sql/share/serbian')
-rw-r--r--sql/share/serbian/errmsg.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/share/serbian/errmsg.txt b/sql/share/serbian/errmsg.txt
index afd4cda9c5e..5a08ae4ba54 100644
--- a/sql/share/serbian/errmsg.txt
+++ b/sql/share/serbian/errmsg.txt
@@ -272,7 +272,7 @@ character-set=cp1250
"%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",
+"Column set to default value; NULL supplied to NOT NULL column '%s' at row %ld",
"Out of range value adjusted for column '%s' at row %ld",
"Data truncated for column '%s' at row %ld",
"Using storage engine %s for table '%s'",
@@ -376,5 +376,6 @@ character-set=cp1250
"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'"