mirror of
https://github.com/MariaDB/server.git
synced 2025-07-27 18:02:13 +03:00
manual merge
BitKeeper/etc/ignore: auto-union BitKeeper/etc/logging_ok: auto-union include/mysql.h: Auto merged include/mysql_com.h: Auto merged libmysql/libmysql.c: Auto merged sql/item_create.cc: Auto merged sql/item_create.h: Auto merged sql/item_strfunc.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/protocol.cc: Auto merged sql/set_var.cc: Auto merged sql/slave.cc: Auto merged sql/slave.h: Auto merged sql/sql_acl.h: Auto merged sql/sql_yacc.yy: Auto merged sql-common/client.c: Auto merged sql/sql_parse.cc: merge commit convert of database to utf8 in case of cahnge_user added
This commit is contained in:
@ -288,4 +288,5 @@
|
||||
#define ER_CANT_AGGREGATE_NCOLLATIONS 1269
|
||||
#define ER_VARIABLE_IS_NOT_STRUCT 1270
|
||||
#define ER_UNKNOWN_COLLATION 1271
|
||||
#define ER_ERROR_MESSAGES 272
|
||||
#define ER_SERVER_IS_IN_SECURE_AUTH_MODE 1272
|
||||
#define ER_ERROR_MESSAGES 273
|
||||
|
Reference in New Issue
Block a user