diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-07-31 16:12:38 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-08-01 08:43:12 +0300 |
commit | a7f84f09bfec22e26b3bd54505a9c8e1d0faff40 (patch) | |
tree | f4d802bbc9dee6bf79da3709637d2213a906a928 /sql/item_strfunc.cc | |
parent | b3e95086e1188dc86e67e44d0fe5a68ea2feca99 (diff) | |
download | mariadb-git-a7f84f09bfec22e26b3bd54505a9c8e1d0faff40.tar.gz |
MDEV-16865 InnoDB fts_query() ignores KILL
The functions fts_ast_visit() and fts_query() inside
InnoDB FULLTEXT INDEX query processing are not checking
for THD::killed (trx_is_interrupted()), like anything
that potentially takes a long time should do.
This is a port of the following change from MySQL 5.7.23,
with a completely rewritten test case.
commit c58c6f8f66ddd0357ecd0c99646aa6bf1dae49c8
Author: Aakanksha Verma <aakanksha.verma@oracle.com>
Date: Fri May 4 15:53:13 2018 +0530
Bug #27155294 MAX_EXECUTION_TIME NOT INTERUPTED WITH FULLTEXT SEARCH USING MECAB
Diffstat (limited to 'sql/item_strfunc.cc')
0 files changed, 0 insertions, 0 deletions