Skip to content

Commit b963cba

Browse files
committed
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().
1 parent 90b66c1 commit b963cba

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

storage/innobase/fts/fts0que.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4019,7 +4019,7 @@ fts_query(
40194019
if (trx_is_interrupted(trx)) {
40204020
error = DB_INTERRUPTED;
40214021
ut_free(lc_query_str);
4022-
if (result != NULL) {
4022+
if (*result) {
40234023
fts_query_free_result(*result);
40244024
}
40254025
goto func_exit;

storage/xtradb/fts/fts0que.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4038,7 +4038,7 @@ fts_query(
40384038
if (trx_is_interrupted(trx)) {
40394039
error = DB_INTERRUPTED;
40404040
ut_free(lc_query_str);
4041-
if (result != NULL) {
4041+
if (*result) {
40424042
fts_query_free_result(*result);
40434043
}
40444044
goto func_exit;

0 commit comments

Comments
 (0)