diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-05-07 22:36:40 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-05-07 22:36:40 +0200 |
| commit | 8db4a5181532d7abbd4458aa127a1b192cc50f8c (patch) | |
| tree | caf9f5006afdeaec11b43f8d8b84f42e0c1ce8c5 /include | |
| parent | 914a2b38bf4685e15a8e2e92579d7c34b35fa6c7 (diff) | |
| download | mariadb-git-8db4a5181532d7abbd4458aa127a1b192cc50f8c.tar.gz | |
merge of "BUG#18233051 - FTS: FAILING ASSERTION: NUM_TOKEN < MAX_PROXIMITY_ITEM"
revno: 5826
committer: Shaohua Wang <shaohua.wang@oracle.com>
branch nick: mysql-5.6-bugfix2
timestamp: Wed 2014-02-19 16:41:14 +0800
message:
BUG#18233051 - FTS: FAILING ASSERTION: NUM_TOKEN < MAX_PROXIMITY_ITEM
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_base.h | 3 | ||||
| -rw-r--r-- | include/my_handler_errors.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/my_base.h b/include/my_base.h index cc056bffa70..cdf8e189031 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -501,7 +501,8 @@ enum ha_base_keytype { #define HA_ERR_ABORTED_BY_USER 188 #define HA_ERR_DISK_FULL 189 #define HA_ERR_INCOMPATIBLE_DEFINITION 190 -#define HA_ERR_LAST 190 /* Copy of last error nr */ +#define HA_ERR_FTS_TOO_MANY_WORDS_IN_PHRASE 191 /* Too many words in a phrase */ +#define HA_ERR_LAST 191 /* Copy of last error nr */ /* Number of different errors */ #define HA_ERR_ERRORS (HA_ERR_LAST - HA_ERR_FIRST + 1) diff --git a/include/my_handler_errors.h b/include/my_handler_errors.h index 76b6b1aa60d..a7afcfe93a3 100644 --- a/include/my_handler_errors.h +++ b/include/my_handler_errors.h @@ -93,7 +93,8 @@ static const char *handler_error_messages[]= "Row is not visible by the current transaction", "Operation was interrupted by end user (probably kill command?)", "Disk full", - "Incompatible key or row definition between the MariaDB .frm file and the information in the storage engine. You have to dump and restore the table to fix this" + "Incompatible key or row definition between the MariaDB .frm file and the information in the storage engine. You have to dump and restore the table to fix this", + "Too many words in a FTS phrase or proximity search" }; #endif /* MYSYS_MY_HANDLER_ERRORS_INCLUDED */ |