Skip to content

Commit f65d450

Browse files
committed
Implemented PS-9289 (Merge MySQL 8.0.39) (preparation)
https://jira.percona.com/browse/PS-9289 Reverting Percona's fix https://perconadev.atlassian.net/browse/PS-7538 due to conflict with upstream fix *** Revert "PS-7538: Crash with innodb_optimize_fulltext_only" This reverts commit c2adfcf.
1 parent 646a7cf commit f65d450

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

storage/innobase/fts/fts0opt.cc

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,6 @@ static byte *fts_zip_read_word(
554554
void *null = nullptr;
555555
byte *ptr = word->f_str;
556556
int flush = Z_NO_FLUSH;
557-
bool read_something = false;
558557

559558
/* Either there was an error or we are at the Z_STREAM_END. */
560559
if (zip->status != Z_OK) {
@@ -605,7 +604,6 @@ static byte *fts_zip_read_word(
605604

606605
word->f_len = len;
607606
len = 0;
608-
read_something = true;
609607
}
610608
break;
611609

@@ -634,9 +632,7 @@ static byte *fts_zip_read_word(
634632
ut_ad(word->f_len == strlen((char *)ptr));
635633
}
636634

637-
return ((zip->status == Z_OK || zip->status == Z_STREAM_END) && read_something
638-
? ptr
639-
: nullptr);
635+
return (zip->status == Z_OK || zip->status == Z_STREAM_END ? ptr : nullptr);
640636
}
641637

642638
/** Callback function to fetch and compress the word in an FTS

0 commit comments

Comments
 (0)