diff options
| author | monty@work.mysql.com <> | 2001-09-02 18:38:33 +0200 |
|---|---|---|
| committer | monty@work.mysql.com <> | 2001-09-02 18:38:33 +0200 |
| commit | 447c18954e904e5770d64ae3b0817a16b9060b74 (patch) | |
| tree | 4689ffbe50e97ce9a47deb58fa2b9e7decdfc6a8 /include/mysqld_error.h | |
| parent | 102cabfe4acd9c78fe321829bd168342b3fbd68a (diff) | |
| parent | 759cf54a9e70013d92fe18a84b3e4c56244de7da (diff) | |
| download | mariadb-git-447c18954e904e5770d64ae3b0817a16b9060b74.tar.gz | |
merge with 3.23.42
Diffstat (limited to 'include/mysqld_error.h')
| -rw-r--r-- | include/mysqld_error.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/include/mysqld_error.h b/include/mysqld_error.h index c921beafa4a..b81e10308ff 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -212,11 +212,12 @@ #define ER_CREATE_DB_WITH_READ_LOCK 1209 #define ER_WRONG_ARGUMENTS 1210 #define ER_NO_PERMISSION_TO_CREATE_USER 1211 -#define ER_CONNECT_TO_MASTER 1212 -#define ER_QUERY_ON_MASTER 1213 -#define ER_ERROR_WHEN_EXECUTING_COMMAND 1214 -#define ER_WRONG_USAGE 1215 -#define ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT 1216 -#define ER_CANT_UPDATE_WITH_READLOCK 1217 -#define ER_MIXING_NOT_ALLOWED 1218 -#define ER_ERROR_MESSAGES 219 +#define ER_UNION_TABLES_IN_DIFFERENT_DIR 1212 +#define ER_CONNECT_TO_MASTER 1213 +#define ER_QUERY_ON_MASTER 1214 +#define ER_ERROR_WHEN_EXECUTING_COMMAND 1215 +#define ER_WRONG_USAGE 1216 +#define ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT 1217 +#define ER_CANT_UPDATE_WITH_READLOCK 1218 +#define ER_MIXING_NOT_ALLOWED 1219 +#define ER_ERROR_MESSAGES 220 |