diff options
author | unknown <bell@sanja.is.com.ua> | 2003-10-26 19:38:41 +0200 |
---|---|---|
committer | unknown <bell@sanja.is.com.ua> | 2003-10-26 19:38:41 +0200 |
commit | c4aaca9f9727289ea50ba9a8a49d0ffdcea8a867 (patch) | |
tree | 2b0f1947bcb4f400d38c3626a4221e1d1eb8f7e5 /include | |
parent | f081a5413068a1491a25b60e0cee5a6619fbfa1e (diff) | |
parent | a92f47e121976ce25592661e96c3781fbc6beab5 (diff) | |
download | mariadb-git-c4aaca9f9727289ea50ba9a8a49d0ffdcea8a867.tar.gz |
merge
sql/set_var.cc:
Auto merged
Diffstat (limited to 'include')
-rw-r--r-- | include/mysqld_error.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/mysqld_error.h b/include/mysqld_error.h index 53714505fc2..0498196a6c6 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -296,4 +296,5 @@ #define ER_MISSING_SKIP_SLAVE 1277 #define ER_UNTIL_COND_IGNORED 1278 #define ER_WRONG_INDEX_NAME 1279 -#define ER_ERROR_MESSAGES 280 +#define ER_WARN_QC_RESIZE 1280 +#define ER_ERROR_MESSAGES 281 |