mirror of
https://github.com/MariaDB/server.git
synced 2025-07-17 12:02:09 +03:00
merge
sql/item.cc: Auto merged
This commit is contained in:
@ -253,39 +253,41 @@
|
||||
#define ER_CANT_USE_OPTION_HERE 1234
|
||||
#define ER_NOT_SUPPORTED_YET 1235
|
||||
#define ER_MASTER_FATAL_ERROR_READING_BINLOG 1236
|
||||
#define ER_WRONG_FK_DEF 1237
|
||||
#define ER_KEY_REF_DO_NOT_MATCH_TABLE_REF 1238
|
||||
#define ER_CARDINALITY_COL 1239
|
||||
#define ER_SUBSELECT_NO_1_ROW 1240
|
||||
#define ER_UNKNOWN_STMT_HANDLER 1241
|
||||
#define ER_CORRUPT_HELP_DB 1242
|
||||
#define ER_CYCLIC_REFERENCE 1243
|
||||
#define ER_AUTO_CONVERT 1244
|
||||
#define ER_ILLEGAL_REFERENCE 1245
|
||||
#define ER_DERIVED_MUST_HAVE_ALIAS 1246
|
||||
#define ER_SELECT_REDUCED 1247
|
||||
#define ER_TABLENAME_NOT_ALLOWED_HERE 1248
|
||||
#define ER_NOT_SUPPORTED_AUTH_MODE 1249
|
||||
#define ER_SPATIAL_CANT_HAVE_NULL 1250
|
||||
#define ER_COLLATION_CHARSET_MISMATCH 1251
|
||||
#define ER_SLAVE_WAS_RUNNING 1252
|
||||
#define ER_SLAVE_WAS_NOT_RUNNING 1253
|
||||
#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_WARN_TOO_FEW_RECORDS 1259
|
||||
#define ER_WARN_TOO_MANY_RECORDS 1260
|
||||
#define ER_WARN_NULL_TO_NOTNULL 1261
|
||||
#define ER_WARN_DATA_OUT_OF_RANGE 1262
|
||||
#define ER_WARN_DATA_TRUNCATED 1263
|
||||
#define ER_WARN_USING_OTHER_HANDLER 1264
|
||||
#define ER_CANT_AGGREGATE_2COLLATIONS 1265
|
||||
#define ER_DROP_USER 1266
|
||||
#define ER_REVOKE_GRANTS 1267
|
||||
#define ER_CANT_AGGREGATE_3COLLATIONS 1268
|
||||
#define ER_CANT_AGGREGATE_NCOLLATIONS 1269
|
||||
#define ER_VARIABLE_IS_NOT_STRUCT 1270
|
||||
#define ER_WARN_FIELD_RESOLVED 1271
|
||||
#define ER_ERROR_MESSAGES 272
|
||||
#define ER_SLAVE_IGNORED_TABLE 1237
|
||||
#define ER_WRONG_FK_DEF 1238
|
||||
#define ER_KEY_REF_DO_NOT_MATCH_TABLE_REF 1239
|
||||
#define ER_CARDINALITY_COL 1240
|
||||
#define ER_SUBSELECT_NO_1_ROW 1241
|
||||
#define ER_UNKNOWN_STMT_HANDLER 1242
|
||||
#define ER_CORRUPT_HELP_DB 1243
|
||||
#define ER_CYCLIC_REFERENCE 1244
|
||||
#define ER_AUTO_CONVERT 1245
|
||||
#define ER_ILLEGAL_REFERENCE 1246
|
||||
#define ER_DERIVED_MUST_HAVE_ALIAS 1247
|
||||
#define ER_SELECT_REDUCED 1248
|
||||
#define ER_TABLENAME_NOT_ALLOWED_HERE 1249
|
||||
#define ER_NOT_SUPPORTED_AUTH_MODE 1250
|
||||
#define ER_SPATIAL_CANT_HAVE_NULL 1251
|
||||
#define ER_COLLATION_CHARSET_MISMATCH 1252
|
||||
#define ER_SLAVE_WAS_RUNNING 1253
|
||||
#define ER_SLAVE_WAS_NOT_RUNNING 1254
|
||||
#define ER_TOO_BIG_FOR_UNCOMPRESS 1255
|
||||
#define ER_ZLIB_Z_MEM_ERROR 1256
|
||||
#define ER_ZLIB_Z_BUF_ERROR 1257
|
||||
#define ER_ZLIB_Z_DATA_ERROR 1258
|
||||
#define ER_CUT_VALUE_GROUP_CONCAT 1259
|
||||
#define ER_WARN_TOO_FEW_RECORDS 1260
|
||||
#define ER_WARN_TOO_MANY_RECORDS 1261
|
||||
#define ER_WARN_NULL_TO_NOTNULL 1262
|
||||
#define ER_WARN_DATA_OUT_OF_RANGE 1263
|
||||
#define ER_WARN_DATA_TRUNCATED 1264
|
||||
#define ER_WARN_USING_OTHER_HANDLER 1265
|
||||
#define ER_CANT_AGGREGATE_2COLLATIONS 1266
|
||||
#define ER_DROP_USER 1267
|
||||
#define ER_REVOKE_GRANTS 1268
|
||||
#define ER_CANT_AGGREGATE_3COLLATIONS 1269
|
||||
#define ER_CANT_AGGREGATE_NCOLLATIONS 1270
|
||||
#define ER_VARIABLE_IS_NOT_STRUCT 1271
|
||||
#define ER_UNKNOWN_COLLATION 1272
|
||||
#define ER_WARN_FIELD_RESOLVED 1273
|
||||
#define ER_ERROR_MESSAGES 274
|
||||
|
Reference in New Issue
Block a user