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 /include | |
| 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 'include')
| -rw-r--r-- | include/mysqld_error.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/include/mysqld_error.h b/include/mysqld_error.h index e168db8312b..f42ecc5015a 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -270,5 +270,10 @@ #define ER_COLLATION_CHARSET_MISMATCH 1251 #define ER_SLAVE_WAS_RUNNING 1252 #define ER_SLAVE_WAS_NOT_RUNNING 1253 -#define ER_CUT_VALUE_GROUP_CONCAT 1254 -#define ER_ERROR_MESSAGES 255 +#define ER_TOO_BIG_FOR_UNCOMPRESS 1254 +#define ER_ZLIB_Z_MEM_ERROR 1255 +#define ER_ZLIB_Z_BUF_ERROR 1256 +#define ER_ZLIB_Z_DATA_ERROR 1257 +#define ER_CUT_VALUE_GROUP_CONCAT 1258 +#define ER_ERROR_MESSAGES 259 + |