diff options
| author | unknown <serg@serg.mylan> | 2003-10-21 11:58:43 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2003-10-21 11:58:43 +0200 |
| commit | 954264b19ebd604ae6f78270225a4078cacd924d (patch) | |
| tree | 8d1d6d06c790efe700899d57a87e63e8d91764f4 /include/mysqld_error.h | |
| parent | 8c2d17c777153881d9f185a7cdb0d5b015cdda38 (diff) | |
| parent | 572e18aeb34dbd68e3b8e87a015a89a75446148d (diff) | |
| download | mariadb-git-954264b19ebd604ae6f78270225a4078cacd924d.tar.gz | |
merged
BitKeeper/etc/ignore:
auto-union
include/m_ctype.h:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
sql/field.cc:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_test.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
strings/ctype-simple.c:
Auto merged
Diffstat (limited to 'include/mysqld_error.h')
| -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 53714505fc2..34184f5ba97 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -230,7 +230,7 @@ #define ER_NO_PERMISSION_TO_CREATE_USER 1211 #define ER_UNION_TABLES_IN_DIFFERENT_DIR 1212 #define ER_LOCK_DEADLOCK 1213 -#define ER_TABLE_CANT_HANDLE_FULLTEXT 1214 +#define ER_TABLE_CANT_HANDLE_FT 1214 #define ER_CANNOT_ADD_FOREIGN 1215 #define ER_NO_REFERENCED_ROW 1216 #define ER_ROW_IS_REFERENCED 1217 @@ -296,4 +296,5 @@ #define ER_MISSING_SKIP_SLAVE 1277 #define ER_UNTIL_COND_IGNORED 1278 #define ER_WRONG_INDEX_NAME 1279 -#define ER_ERROR_MESSAGES 280 +#define ER_BAD_FT_COLUMN 1280 +#define ER_ERROR_MESSAGES 281 |