diff options
| author | unknown <peter@mysql.com> | 2002-12-04 16:26:29 +0300 |
|---|---|---|
| committer | unknown <peter@mysql.com> | 2002-12-04 16:26:29 +0300 |
| commit | 577cb3238b59ab9f885e9c892d137da3b6c8b599 (patch) | |
| tree | dd20822cd74c5e54197d66226784622a58842177 /include | |
| parent | 526ff493bcc374952ca8d66157e48033d21268a1 (diff) | |
| parent | 265bf238951c3a123c4d6f7fea600175a399cf96 (diff) | |
| download | mariadb-git-577cb3238b59ab9f885e9c892d137da3b6c8b599.tar.gz | |
Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1
sql/mysql_priv.h:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysqld_error.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/mysqld_error.h b/include/mysqld_error.h index 7c77d229b81..81a24e89164 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -109,7 +109,7 @@ #define ER_CANT_REMOVE_ALL_FIELDS 1090 #define ER_CANT_DROP_FIELD_OR_KEY 1091 #define ER_INSERT_INFO 1092 -#define ER_INSERT_TABLE_USED 1093 +#define ER_UPDATE_TABLE_USED 1093 #define ER_NO_SUCH_THREAD 1094 #define ER_KILL_DENIED_ERROR 1095 #define ER_NO_TABLES_USED 1096 @@ -264,4 +264,5 @@ #define ER_ILLEGAL_REFERENCE 1245 #define ER_DERIVED_MUST_HAVE_ALIAS 1246 #define ER_SELECT_REDUCED 1247 -#define ER_ERROR_MESSAGES 248 +#define ER_TABLENAME_NOT_ALLOWED_HERE 1248 +#define ER_ERROR_MESSAGES 249 |