1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-18659: Revert a non-functional change

Browse Source 
fts_fetch_index_words(): Restore the initialization len=0.
The test innodb_fts.create in 10.2 would end up in an infinite loop
if this assignment is removed, because a following iteration of the
while() loop would assign zip->zp->avail_in=len with the original value
instead of the 0 that was reset in the previous iteration.
This commit is contained in:
Marko Mäkelä 2019-03-06 12:45:54 +02:00
parent b761211685
commit 4b5dc47f56
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
storage/innobase/fts/fts0opt.cc
View File

@ -717,15 +717,15 @@ fts_fetch_index_words(
zip->zp->next_in = static_cast<byte*>(data);
zip->zp->avail_in = len;
ut_a(len <= FTS_MAX_WORD_LEN);
len = 0;
}
break;
continue;
case Z_STREAM_END:
case Z_BUF_ERROR:
case Z_STREAM_ERROR:
default:
ut_error;
break;
}
}

4
storage/xtradb/fts/fts0opt.cc
View File

@ -717,15 +717,15 @@ fts_fetch_index_words(
zip->zp->next_in = static_cast<byte*>(data);
zip->zp->avail_in = len;
ut_a(len <= FTS_MAX_WORD_LEN);
len = 0;
}
break;
continue;
case Z_STREAM_END:
case Z_BUF_ERROR:
case Z_STREAM_ERROR:
default:
ut_error;
break;
}
}