Skip to content

M
MariaDB
Commit c7c54ce6 authored by Marko Mäkelä's avatar Marko Mäkelä
Browse files
Options

fts_doc_ids_free(): Define inline

parent 7f721107
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 48 deletions
storage/innobase/fts/fts0fts.cc
View file @ c7c54ce6
...@@ -2889,22 +2889,6 @@ fts_doc_ids_create(void) ...@@ -2889,22 +2889,6 @@ fts_doc_ids_create(void)
return(fts_doc_ids); return(fts_doc_ids);
} }
/*********************************************************************//**
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. */ Do commit-phase steps necessary for the insertion of a new row. */
void void
......
storage/innobase/include/fts0fts.h
View file @ c7c54ce6
/***************************************************************************** /*****************************************************************************
Copyright (c) 2011, 2018, Oracle and/or its affiliates. All Rights Reserved. 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 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 the terms of the GNU General Public License as published by the Free Software
...@@ -429,13 +429,11 @@ fts_doc_ids_t* ...@@ -429,13 +429,11 @@ fts_doc_ids_t*
fts_doc_ids_create(void); fts_doc_ids_create(void);
/*=====================*/ /*=====================*/
/******************************************************************//** /** Free fts_doc_ids_t */
Free a fts_doc_ids_t. */ inline void fts_doc_ids_free(fts_doc_ids_t* doc_ids)
UNIV_INTERN {
void mem_heap_free(static_cast<mem_heap_t*>(doc_ids->self_heap->arg));
fts_doc_ids_free( }
/*=============*/
fts_doc_ids_t* doc_ids); /*!< in: doc_ids to free */
/******************************************************************//** /******************************************************************//**
Notify the FTS system about an operation on an FTS-indexed table. */ Notify the FTS system about an operation on an FTS-indexed table. */
......
storage/xtradb/fts/fts0fts.cc
View file @ c7c54ce6
...@@ -2889,22 +2889,6 @@ fts_doc_ids_create(void) ...@@ -2889,22 +2889,6 @@ fts_doc_ids_create(void)
return(fts_doc_ids); return(fts_doc_ids);
} }
/*********************************************************************//**
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. */ Do commit-phase steps necessary for the insertion of a new row. */
void void
......
storage/xtradb/include/fts0fts.h
View file @ c7c54ce6
/***************************************************************************** /*****************************************************************************
Copyright (c) 2011, 2018, Oracle and/or its affiliates. All Rights Reserved. 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 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 the terms of the GNU General Public License as published by the Free Software
...@@ -429,13 +429,11 @@ fts_doc_ids_t* ...@@ -429,13 +429,11 @@ fts_doc_ids_t*
fts_doc_ids_create(void); fts_doc_ids_create(void);
/*=====================*/ /*=====================*/
/******************************************************************//** /** Free fts_doc_ids_t */
Free a fts_doc_ids_t. */ inline void fts_doc_ids_free(fts_doc_ids_t* doc_ids)
UNIV_INTERN {
void mem_heap_free(static_cast<mem_heap_t*>(doc_ids->self_heap->arg));
fts_doc_ids_free( }
/*=============*/
fts_doc_ids_t* doc_ids); /*!< in: doc_ids to free */
/******************************************************************//** /******************************************************************//**
Notify the FTS system about an operation on an FTS-indexed table. */ Notify the FTS system about an operation on an FTS-indexed table. */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7