From a1f5c972a408d6cab0e69e0d3790e0fad7580914 Mon Sep 17 00:00:00 2001 From: Georg Richter Date: Tue, 20 Jul 2021 17:44:56 +0200 Subject: [PATCH] Updated mysqld_errmsg.h from 10.6.4 --- include/mysqld_error.h | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/include/mysqld_error.h b/include/mysqld_error.h index 04ec2da3..f3c8a8b4 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -727,7 +727,7 @@ #define ER_BINLOG_UNSAFE_WRITE_AUTOINC_SELECT 1722 #define ER_BINLOG_UNSAFE_CREATE_SELECT_AUTOINC 1723 #define ER_BINLOG_UNSAFE_INSERT_TWO_KEYS 1724 -#define ER_TABLE_IN_FK_CHECK 1725 +#define ER_UNUSED_28 1725 #define ER_UNUSED_1 1726 #define ER_BINLOG_UNSAFE_AUTOINC_NOT_FIRST 1727 #define ER_CANNOT_LOAD_FROM_TABLE_V2 1728 @@ -1047,8 +1047,8 @@ /* New section */ #define ER_ERROR_FIRST_SECTION_5 4000 -#define ER_COMMULTI_BADCONTEXT 4000 -#define ER_BAD_COMMAND_IN_MULTI 4001 +#define ER_UNUSED_26 4000 +#define ER_UNUSED_27 4001 #define ER_WITH_COL_WRONG_LIST 4002 #define ER_TOO_MANY_DEFINITIONS_IN_WITH_CLAUSE 4003 #define ER_DUP_QUERY_NAME 4004 @@ -1094,7 +1094,7 @@ #define ER_JSON_PATH_NO_WILDCARD 4044 #define ER_JSON_PATH_ARRAY 4045 #define ER_JSON_ONE_OR_ALL 4046 -#define ER_UNSUPPORT_COMPRESSED_TEMPORARY_TABLE 4047 +#define ER_UNSUPPORTED_COMPRESSED_TABLE 4047 #define ER_GEOJSON_INCORRECT 4048 #define ER_GEOJSON_TOO_FEW_POINTS 4049 #define ER_GEOJSON_NOT_CLOSED 4050 @@ -1221,5 +1221,14 @@ #define ER_KEY_CANT_HAVE_WITHOUT_OVERLAPS 4171 #define ER_NOT_ALLOWED_IN_THIS_CONTEXT 4172 #define ER_DATA_WAS_COMMITED_UNDER_ROLLBACK 4173 -#define ER_ERROR_LAST 4173 +#define ER_PK_INDEX_CANT_BE_IGNORED 4174 +#define ER_BINLOG_UNSAFE_SKIP_LOCKED 4175 +#define ER_JSON_TABLE_ERROR_ON_FIELD 4176 +#define ER_JSON_TABLE_ALIAS_REQUIRED 4177 +#define ER_JSON_TABLE_SCALAR_EXPECTED 4178 +#define ER_JSON_TABLE_MULTIPLE_MATCHES 4179 +#define ER_WITH_TIES_NEEDS_ORDER 4180 +#define ER_REMOVED_ORPHAN_TRIGGER 4181 +#define ER_STORAGE_ENGINE_DISABLED 4182 +#define ER_ERROR_LAST 4182 #endif /* ER_ERROR_FIRST */