diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-03-29 16:16:21 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-03-29 16:16:21 +0300 |
commit | b242c3141f263f9f73f179ad5edd385906109262 (patch) | |
tree | fcba93da0a91e2b615e4f85a5ba449641641b49f /storage/innobase/fts | |
parent | b2fa874e462e7352be173a3075a65e49f2fcc404 (diff) | |
parent | c14f60a72f28bb5102d529b3946c2daf8f3b590b (diff) | |
download | mariadb-git-b242c3141f263f9f73f179ad5edd385906109262.tar.gz |
Merge 10.5 into 10.6
Diffstat (limited to 'storage/innobase/fts')
-rw-r--r-- | storage/innobase/fts/fts0fts.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/storage/innobase/fts/fts0fts.cc b/storage/innobase/fts/fts0fts.cc index c8aa6aab35a..964a216cd39 100644 --- a/storage/innobase/fts/fts0fts.cc +++ b/storage/innobase/fts/fts0fts.cc @@ -2219,9 +2219,7 @@ fts_trx_table_create( fts_trx_table_t* ftt; ftt = static_cast<fts_trx_table_t*>( - mem_heap_alloc(fts_trx->heap, sizeof(*ftt))); - - memset(ftt, 0x0, sizeof(*ftt)); + mem_heap_zalloc(fts_trx->heap, sizeof *ftt)); ftt->table = table; ftt->fts_trx = fts_trx; |