diff options
| author | unknown <bell@laptop.sanja.is.com.ua> | 2003-10-06 12:08:28 +0300 |
|---|---|---|
| committer | unknown <bell@laptop.sanja.is.com.ua> | 2003-10-06 12:08:28 +0300 |
| commit | 84285351be6b99f771af663085feda2670d36638 (patch) | |
| tree | fb79dae1b7c2d199bada6e1802519c5ab1664fc1 /include | |
| parent | d2574b928e728cbe4c0551b91c528ea13b6dc579 (diff) | |
| parent | 4379cbcf3056a33f41ddf489828203a6c03e793f (diff) | |
| download | mariadb-git-84285351be6b99f771af663085feda2670d36638.tar.gz | |
Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-udf-5.0
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysqld_error.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/mysqld_error.h b/include/mysqld_error.h index 7f317e93604..18283d576ad 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -312,4 +312,6 @@ #define ER_QUERY_INTERRUPTED 1293 #define ER_SP_WRONG_NO_OF_ARGS 1294 #define ER_SP_COND_MISMATCH 1295 -#define ER_ERROR_MESSAGES 296 +#define ER_SP_NORETURN 1296 +#define ER_SP_NORETURNEND 1297 +#define ER_ERROR_MESSAGES 298 |