Follow-up fix to MDEV-16865: InnoDB fts_query() ignores KILL

fts_query(): Remove a redundant condition (result will never be NULL),
and instead check if *result is NULL, to prevent SIGSEGV in
fts_query_free_result().
This commit is contained in:
Marko Mäkelä 2018-08-03 11:49:49 +03:00
parent 90b66c1699
commit b963cbaf4b
2 changed files with 2 additions and 2 deletions

View file

@ -4019,7 +4019,7 @@ fts_query(
if (trx_is_interrupted(trx)) {
error = DB_INTERRUPTED;
ut_free(lc_query_str);
if (result != NULL) {
if (*result) {
fts_query_free_result(*result);
}
goto func_exit;

View file

@ -4038,7 +4038,7 @@ fts_query(
if (trx_is_interrupted(trx)) {
error = DB_INTERRUPTED;
ut_free(lc_query_str);
if (result != NULL) {
if (*result) {
fts_query_free_result(*result);
}
goto func_exit;