diff options
author | unknown <serg@serg.mysql.com> | 2001-10-23 11:20:01 +0200 |
---|---|---|
committer | unknown <serg@serg.mysql.com> | 2001-10-23 11:20:01 +0200 |
commit | 4c0532108b5783ffd73b005fa06e8bdb43670c6f (patch) | |
tree | fba4b9c9b1268d8b0cc99f5faea0594efeedaa76 /include | |
parent | 2f7bbeaaad93b5f79a0424836376be79d42b844c (diff) | |
parent | adb261ec4dc3cad0dff1133784e70679e22206a7 (diff) | |
download | mariadb-git-4c0532108b5783ffd73b005fa06e8bdb43670c6f.tar.gz |
merged
BitKeeper/deleted/.del-violite.c~984c09cffe14a11b:
Auto merged
BitKeeper/deleted/.del-violite.c~d7b85be615595ace:
Auto merged
sql/sql_table.cc:
Auto merged
sql/share/russian/errmsg.txt:
merged (partially translated)
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 a4e7066d483..5ac14c1155b 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -222,4 +222,5 @@ #define ER_CANT_UPDATE_WITH_READLOCK 1219 #define ER_MIXING_NOT_ALLOWED 1220 #define ER_DUP_ARGUMENT 1221 -#define ER_ERROR_MESSAGES 222 +#define ER_TABLE_CANT_HANDLE_FULLTEXT 1222 +#define ER_ERROR_MESSAGES 223 |