diff options
| author | unknown <guilhem@mysql.com> | 2004-11-11 00:27:34 +0100 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2004-11-11 00:27:34 +0100 |
| commit | 6b1450d9b442a7d3bfe8715fbc6d97e27da1b817 (patch) | |
| tree | 8de72e0c86f579114f413571cd8e18f370753ec5 /include | |
| parent | 71196720d1d50a2d84b0af894db248c5cafd03f3 (diff) | |
| parent | b6eb77f73d09c5feb249b6622db461c47afb7c05 (diff) | |
| download | mariadb-git-6b1450d9b442a7d3bfe8715fbc6d97e27da1b817.tar.gz | |
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
sql/handler.cc:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysqld_error.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/mysqld_error.h b/include/mysqld_error.h index 67c2b0aba73..776869ff045 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -319,5 +319,4 @@ #define ER_INVALID_CHARACTER_STRING 1300 #define ER_WARN_ALLOWED_PACKET_OVERFLOWED 1301 #define ER_CONFLICTING_DECLARATIONS 1302 -#define ER_NO_CONS_READ_ENGINE 1303 -#define ER_ERROR_MESSAGES 304 +#define ER_ERROR_MESSAGES 303 |