diff options
| author | unknown <serg@serg.mylan> | 2003-10-30 19:26:57 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2003-10-30 19:26:57 +0100 |
| commit | d054ce1c5d21f981e73e67da29d418ddddc835a3 (patch) | |
| tree | 65d6f2bdf4e0936294f60fb6578a4a0d97c743ce /include/mysqld_error.h | |
| parent | 372e949242e637d0d80a694132a221e3842acdbd (diff) | |
| parent | a4161274ef18a38eff95272cf9f05f46fb08fcb7 (diff) | |
| download | mariadb-git-d054ce1c5d21f981e73e67da29d418ddddc835a3.tar.gz | |
merged
sql/set_var.cc:
Auto merged
Diffstat (limited to 'include/mysqld_error.h')
| -rw-r--r-- | include/mysqld_error.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/mysqld_error.h b/include/mysqld_error.h index 34184f5ba97..60204349de2 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -296,5 +296,6 @@ #define ER_MISSING_SKIP_SLAVE 1277 #define ER_UNTIL_COND_IGNORED 1278 #define ER_WRONG_INDEX_NAME 1279 -#define ER_BAD_FT_COLUMN 1280 -#define ER_ERROR_MESSAGES 281 +#define ER_WARN_QC_RESIZE 1280 +#define ER_BAD_FT_COLUMN 1281 +#define ER_ERROR_MESSAGES 282 |