Commit b963cbaf authored by Marko Mäkelä's avatar Marko Mäkelä

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().
parent 90b66c16
...@@ -4019,7 +4019,7 @@ fts_query( ...@@ -4019,7 +4019,7 @@ fts_query(
if (trx_is_interrupted(trx)) { if (trx_is_interrupted(trx)) {
error = DB_INTERRUPTED; error = DB_INTERRUPTED;
ut_free(lc_query_str); ut_free(lc_query_str);
if (result != NULL) { if (*result) {
fts_query_free_result(*result); fts_query_free_result(*result);
} }
goto func_exit; goto func_exit;
......
...@@ -4038,7 +4038,7 @@ fts_query( ...@@ -4038,7 +4038,7 @@ fts_query(
if (trx_is_interrupted(trx)) { if (trx_is_interrupted(trx)) {
error = DB_INTERRUPTED; error = DB_INTERRUPTED;
ut_free(lc_query_str); ut_free(lc_query_str);
if (result != NULL) { if (*result) {
fts_query_free_result(*result); fts_query_free_result(*result);
} }
goto func_exit; goto func_exit;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment