diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysqld_error.h | 4 | ||||
| -rw-r--r-- | include/sql_state.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/mysqld_error.h b/include/mysqld_error.h index 7646d3e7494..3c20202603f 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -256,8 +256,8 @@ #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_OPERAND_COLUMNS 1240 +#define ER_SUBQUERY_NO_1_ROW 1241 #define ER_UNKNOWN_STMT_HANDLER 1242 #define ER_CORRUPT_HELP_DB 1243 #define ER_CYCLIC_REFERENCE 1244 diff --git a/include/sql_state.h b/include/sql_state.h index 26568ac3e0d..c0b7cf97ea5 100644 --- a/include/sql_state.h +++ b/include/sql_state.h @@ -145,8 +145,8 @@ ER_WRONG_TYPE_FOR_VAR, "42000", "", ER_CANT_USE_OPTION_HERE, "42000", "", ER_NOT_SUPPORTED_YET, "42000", "", ER_WRONG_FK_DEF, "42000", "", -ER_CARDINALITY_COL, "21000", "", -ER_SUBSELECT_NO_1_ROW, "21000", "", +ER_OPERAND_COLUMNS, "21000", "", +ER_SUBQUERY_NO_1_ROW, "21000", "", ER_ILLEGAL_REFERENCE, "42S22", "", ER_DERIVED_MUST_HAVE_ALIAS, "42000", "", ER_SELECT_REDUCED, "01000", "", |