mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
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.
This commit is contained in:
@ -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
|
||||
|
||||
|
Reference in New Issue
Block a user