diff options
| author | unknown <pem@mysql.com> | 2003-03-18 16:12:50 +0100 |
|---|---|---|
| committer | unknown <pem@mysql.com> | 2003-03-18 16:12:50 +0100 |
| commit | d956a1c580c0df2b3018fe341bb1bc2aa8bddb53 (patch) | |
| tree | f226e7f748105e5857cd34b3096608f3c89dff07 /include/mysqld_error.h | |
| parent | 18d3292bb7cd47db17207f8cdbf74e925b34e74b (diff) | |
| parent | 867efa281af9ac6ff5d7930d2575fbca346cd443 (diff) | |
| download | mariadb-git-d956a1c580c0df2b3018fe341bb1bc2aa8bddb53.tar.gz | |
Merged 4.1 -> 5.0.
BitKeeper/etc/logging_ok:
auto-union
client/mysql.cc:
Auto merged
configure.in:
Auto merged
mysql-test/r/rpl_temporary.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/t/subselect.test:
Auto merged
scripts/mysql_install_db.sh:
Auto merged
sql/item.h:
Auto merged
sql/item_func.h:
Auto merged
sql/lex.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'include/mysqld_error.h')
| -rw-r--r-- | include/mysqld_error.h | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/include/mysqld_error.h b/include/mysqld_error.h index 2f4158110cd..70e9a70ea9d 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -270,4 +270,16 @@ #define ER_COLLATION_CHARSET_MISMATCH 1251 #define ER_SLAVE_WAS_RUNNING 1252 #define ER_SLAVE_WAS_NOT_RUNNING 1253 -#define ER_ERROR_MESSAGES 254 +#define ER_SP_NO_RECURSIVE_CREATE 1254 +#define ER_SP_ALREADY_EXISTS 1255 +#define ER_SP_DOES_NOT_EXIST 1256 +#define ER_SP_DROP_FAILED 1257 +#define ER_SP_STORE_FAILED 1258 +#define ER_SP_LILABEL_MISMATCH 1259 +#define ER_SP_LABEL_REDEFINE 1260 +#define ER_SP_LABEL_MISMATCH 1261 +#define ER_SP_UNINIT_VAR 1262 +#define ER_SP_BADSELECT 1263 +#define ER_SP_BADRETURN 1264 +#define ER_SP_BADQUERY 1265 +#define ER_ERROR_MESSAGES 266 |