diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-04-18 16:19:39 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-04-18 16:19:39 +0300 |
commit | 821e3d52c0e7405aea7054e138604ae1a4e8c921 (patch) | |
tree | 1dbf11353bfd7ca04e176bc719e3dcec42eafe11 /storage/innobase/include/page0zip.inl | |
parent | 6c196090c8c265bfd93df1e2ee6b18cda2b1d2d8 (diff) | |
download | mariadb-git-821e3d52c0e7405aea7054e138604ae1a4e8c921.tar.gz |
MDEV-30986 hybrid build with 10.6 InnoDB10.56-MDEV-30986
Diffstat (limited to 'storage/innobase/include/page0zip.inl')
-rw-r--r-- | storage/innobase/include/page0zip.inl | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/storage/innobase/include/page0zip.inl b/storage/innobase/include/page0zip.inl index b0622ba79c3..afc877c3720 100644 --- a/storage/innobase/include/page0zip.inl +++ b/storage/innobase/include/page0zip.inl @@ -304,18 +304,6 @@ page_zip_available( } /**********************************************************************//** -Initialize a compressed page descriptor. */ -UNIV_INLINE -void -page_zip_des_init( -/*==============*/ - page_zip_des_t* page_zip) /*!< in/out: compressed page - descriptor */ -{ - memset(page_zip, 0, sizeof *page_zip); -} - -/**********************************************************************//** Reset the counters used for filling INFORMATION_SCHEMA.innodb_cmp_per_index. */ UNIV_INLINE @@ -323,11 +311,7 @@ void page_zip_reset_stat_per_index() /*===========================*/ { - mutex_enter(&page_zip_stat_per_index_mutex); - - page_zip_stat_per_index.erase( - page_zip_stat_per_index.begin(), - page_zip_stat_per_index.end()); - - mutex_exit(&page_zip_stat_per_index_mutex); + mysql_mutex_lock(&page_zip_stat_per_index_mutex); + page_zip_stat_per_index.clear(); + mysql_mutex_unlock(&page_zip_stat_per_index_mutex); } |