mirror of
https://github.com/MariaDB/server.git
synced 2025-07-27 18:02:13 +03:00
merging
include/mysqld_error.h: Auto merged mysql-test/r/subselect.result: Auto merged sql/item_subselect.cc: Auto merged sql/share/czech/errmsg.txt: Auto merged sql/share/danish/errmsg.txt: Auto merged sql/share/dutch/errmsg.txt: Auto merged sql/share/english/errmsg.txt: Auto merged sql/share/estonian/errmsg.txt: Auto merged sql/share/french/errmsg.txt: Auto merged sql/share/german/errmsg.txt: Auto merged sql/share/greek/errmsg.txt: Auto merged sql/sql_base.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/share/hungarian/errmsg.txt: Auto merged sql/share/italian/errmsg.txt: Auto merged sql/share/japanese/errmsg.txt: Auto merged sql/share/korean/errmsg.txt: Auto merged sql/share/norwegian-ny/errmsg.txt: Auto merged sql/share/norwegian/errmsg.txt: Auto merged sql/share/polish/errmsg.txt: Auto merged sql/share/portuguese/errmsg.txt: Auto merged sql/share/romanian/errmsg.txt: Auto merged sql/share/russian/errmsg.txt: Auto merged sql/share/serbian/errmsg.txt: Auto merged sql/share/slovak/errmsg.txt: Auto merged sql/share/spanish/errmsg.txt: Auto merged sql/share/swedish/errmsg.txt: Auto merged sql/share/ukrainian/errmsg.txt: Auto merged
This commit is contained in:
@ -262,4 +262,5 @@
|
||||
#define ER_CYCLIC_REFERENCE 1243
|
||||
#define ER_AUTO_CONVERT 1244
|
||||
#define ER_ILLEGAL_REFERENCE 1245
|
||||
#define ER_ERROR_MESSAGES 246
|
||||
#define ER_SELECT_REDUCED 1246
|
||||
#define ER_ERROR_MESSAGES 247
|
||||
|
Reference in New Issue
Block a user