From 8db4a5181532d7abbd4458aa127a1b192cc50f8c Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Wed, 7 May 2014 22:36:40 +0200 Subject: 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_handler_errors.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'include/my_handler_errors.h') 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 */ -- cgit v1.2.1