From 8db4a5181532d7abbd4458aa127a1b192cc50f8c Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Wed, 7 May 2014 22:36:40 +0200 Subject: [PATCH] merge of "BUG#18233051 - FTS: FAILING ASSERTION: NUM_TOKEN < MAX_PROXIMITY_ITEM" revno: 5826 committer: Shaohua Wang 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 --- include/my_base.h | 3 ++- include/my_handler_errors.h | 3 ++- sql/handler.cc | 1 + 3 files changed, 5 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 */ diff --git a/sql/handler.cc b/sql/handler.cc index 3cb2106a443..2991b6eb11c 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -359,6 +359,7 @@ int ha_init_errors(void) SETMSG(HA_FTS_INVALID_DOCID, "Invalid InnoDB FTS Doc ID"); SETMSG(HA_ERR_TABLE_IN_FK_CHECK, ER_DEFAULT(ER_TABLE_IN_FK_CHECK)); SETMSG(HA_ERR_DISK_FULL, ER_DEFAULT(ER_DISK_FULL)); + SETMSG(HA_ERR_FTS_TOO_MANY_WORDS_IN_PHRASE, "Too many words in a FTS phrase or proximity search"); /* Register the error messages for use with my_error(). */ return my_error_register(get_handler_errmsgs, HA_ERR_FIRST, HA_ERR_LAST);