diff options
author | unknown <vva@eagle.mysql.r18.ru> | 2003-04-10 10:25:21 -0400 |
---|---|---|
committer | unknown <vva@eagle.mysql.r18.ru> | 2003-04-10 10:25:21 -0400 |
commit | a4f6f3ad7411d6f464bb776528957a492f475248 (patch) | |
tree | 223b27af091cce7e846a9f37193ba787e49f4b67 /sql/share/serbian | |
parent | 3bcbdd78522701081d1b83ea84b5ddd7f6fc9ce0 (diff) | |
parent | 75bdeb1b21dca9266c077f9bade0e88bec716e9c (diff) | |
download | mariadb-git-a4f6f3ad7411d6f464bb776528957a492f475248.tar.gz |
Merge
sql/item_create.cc:
Auto merged
sql/item_create.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/lex.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
include/mysqld_error.h:
merge.
sql/share/czech/errmsg.txt:
SCCS merged
sql/share/danish/errmsg.txt:
merge.
sql/share/dutch/errmsg.txt:
merge .
sql/share/english/errmsg.txt:
merge.
sql/share/estonian/errmsg.txt:
merge.
sql/share/french/errmsg.txt:
merge.
sql/share/german/errmsg.txt:
merge.
sql/share/greek/errmsg.txt:
merge.
sql/share/hungarian/errmsg.txt:
e
merge.
sql/share/italian/errmsg.txt:
merge.
sql/share/japanese/errmsg.txt:
merge.
sql/share/korean/errmsg.txt:
merge.
sql/share/norwegian/errmsg.txt:
merge.
sql/share/norwegian-ny/errmsg.txt:
merge.
sql/share/polish/errmsg.txt:
merge.
sql/share/portuguese/errmsg.txt:
merge.
sql/share/romanian/errmsg.txt:
SCCS merged
sql/share/russian/errmsg.txt:
merge.
sql/share/serbian/errmsg.txt:
merge.
sql/share/slovak/errmsg.txt:
merge.
sql/share/spanish/errmsg.txt:
merge.
sql/share/swedish/errmsg.txt:
merge.
sql/share/ukrainian/errmsg.txt:
merge.
Diffstat (limited to 'sql/share/serbian')
-rw-r--r-- | sql/share/serbian/errmsg.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/share/serbian/errmsg.txt b/sql/share/serbian/errmsg.txt index eb6fd0f06f3..8e40e195d1a 100644 --- a/sql/share/serbian/errmsg.txt +++ b/sql/share/serbian/errmsg.txt @@ -251,4 +251,8 @@ "COLLATION '%s' is not valid for CHARACTER SET '%s'" "The slave was already running" "The slave was already stopped" -"%d line(s) was(were) cut by group_concat()" +"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)" +"Z_BUF_ERROR: Not enough memory available for zlib" +"Z_MEM_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()"
\ No newline at end of file |