diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-13 11:32:20 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-13 11:32:20 +0300 |
| commit | c7c54ce606b645fc1bee1ec2b04e491dab89a7ad (patch) | |
| tree | 7acc8b0e3b6aa764fee57e138e13329f6a789e50 /storage/innobase | |
| parent | 7f7211073ceec9d35947ec5c9286878cfa4d3d78 (diff) | |
| download | mariadb-git-c7c54ce606b645fc1bee1ec2b04e491dab89a7ad.tar.gz | |
fts_doc_ids_free(): Define inline
Diffstat (limited to 'storage/innobase')
| -rw-r--r-- | storage/innobase/fts/fts0fts.cc | 16 | ||||
| -rw-r--r-- | storage/innobase/include/fts0fts.h | 14 |
2 files changed, 6 insertions, 24 deletions
diff --git a/storage/innobase/fts/fts0fts.cc b/storage/innobase/fts/fts0fts.cc index f78d0bd43b9..bfb469b1e2d 100644 --- a/storage/innobase/fts/fts0fts.cc +++ b/storage/innobase/fts/fts0fts.cc @@ -2890,22 +2890,6 @@ fts_doc_ids_create(void) } /*********************************************************************//** -Free a fts_doc_ids_t. */ - -void -fts_doc_ids_free( -/*=============*/ - fts_doc_ids_t* fts_doc_ids) -{ - mem_heap_t* heap = static_cast<mem_heap_t*>( - fts_doc_ids->self_heap->arg); - - memset(fts_doc_ids, 0, sizeof(*fts_doc_ids)); - - mem_heap_free(heap); -} - -/*********************************************************************//** Do commit-phase steps necessary for the insertion of a new row. */ void fts_add( diff --git a/storage/innobase/include/fts0fts.h b/storage/innobase/include/fts0fts.h index ac27094aa30..19a1058dc0c 100644 --- a/storage/innobase/include/fts0fts.h +++ b/storage/innobase/include/fts0fts.h @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 2011, 2018, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2016, 2017, MariaDB Corporation. +Copyright (c) 2016, 2019, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -429,13 +429,11 @@ fts_doc_ids_t* fts_doc_ids_create(void); /*=====================*/ -/******************************************************************//** -Free a fts_doc_ids_t. */ -UNIV_INTERN -void -fts_doc_ids_free( -/*=============*/ - fts_doc_ids_t* doc_ids); /*!< in: doc_ids to free */ +/** Free fts_doc_ids_t */ +inline void fts_doc_ids_free(fts_doc_ids_t* doc_ids) +{ + mem_heap_free(static_cast<mem_heap_t*>(doc_ids->self_heap->arg)); +} /******************************************************************//** Notify the FTS system about an operation on an FTS-indexed table. */ |