mirror of
https://github.com/MariaDB/server.git
synced 2025-01-30 02:30:06 +01:00
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:
parent
90b66c1699
commit
b963cbaf4b
2 changed files with 2 additions and 2 deletions
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Add table
Reference in a new issue