diff options
| author | unknown <guilhem@mysql.com> | 2004-11-10 18:02:00 +0100 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2004-11-10 18:02:00 +0100 |
| commit | f06a4e2381ba828ff4acff38fa7323e6dc2d0d77 (patch) | |
| tree | f1a7b9fc07d507a919577987ffbf388f1f2c99af /include | |
| parent | 4f110c51f933b093ef86ef9c0aab10cd1d55f159 (diff) | |
| parent | fbc56a5114cbc292afedb6b0114cbd6a1e4c4e6b (diff) | |
| download | mariadb-git-f06a4e2381ba828ff4acff38fa7323e6dc2d0d77.tar.gz | |
Merge
client/mysqldump.c:
Auto merged
sql/handler.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/handler.h:
SCCS 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 776869ff045..67c2b0aba73 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -319,4 +319,5 @@ #define ER_INVALID_CHARACTER_STRING 1300 #define ER_WARN_ALLOWED_PACKET_OVERFLOWED 1301 #define ER_CONFLICTING_DECLARATIONS 1302 -#define ER_ERROR_MESSAGES 303 +#define ER_NO_CONS_READ_ENGINE 1303 +#define ER_ERROR_MESSAGES 304 |