diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-27 10:43:23 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-27 10:43:23 +0300 |
| commit | ca9e0089d5d9c8777c58b1e44ff97e7bcb1bdddf (patch) | |
| tree | ed50bb083a6ba280bcebb8b0fdb1ac3f73646e9a /storage/maria | |
| parent | 2d6719d7ee92843d5b0b9a27c7deaff5cacd4745 (diff) | |
| download | mariadb-git-ca9e0089d5d9c8777c58b1e44ff97e7bcb1bdddf.tar.gz | |
MDEV-19740: Fix GCC 9.2.1 -Wmaybe-uninitialized on AMD64
For CMAKE_BUILD_TYPE=Debug, the default MYSQL_MAINTAINER_MODE=AUTO
implies -Werror along with other flags in cmake/maintainer.cmake,
which would break the debug builds when CMAKE_CXX_FLAGS include -O2.
This fix includes a backport of 6dd3f24090ce2d237037eb09cf7db083ebbc92f9
from MariaDB 10.3.
Diffstat (limited to 'storage/maria')
| -rw-r--r-- | storage/maria/ma_ft_nlq_search.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/maria/ma_ft_nlq_search.c b/storage/maria/ma_ft_nlq_search.c index d83981e424c..2afd493b32d 100644 --- a/storage/maria/ma_ft_nlq_search.c +++ b/storage/maria/ma_ft_nlq_search.c @@ -83,13 +83,13 @@ static int walk_and_match(FT_WORD *word, uint32 count, ALL_IN_ONE *aio) #error #endif DBUG_ENTER("walk_and_match"); - LINT_INIT_STRUCT(subkeys); word->weight=LWS_FOR_QUERY; _ma_ft_make_key(info, &key, aio->keynr, keybuff, word, 0); key.data_length-= HA_FT_WLEN; doc_cnt=0; + subkeys.i= 0; if (share->lock_key_trees) mysql_rwlock_rdlock(&share->keyinfo[aio->keynr].root_lock); |