summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-01-10 11:21:17 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2022-01-10 11:21:17 +0200
commitfcbd3989243ec6b0505f8665fc6850f1449afb14 (patch)
tree1b34e76269916b79dea8d29e5c4be4ac218b5025
parent75d4c530c5ddecc6f5a414b6e3e55922170f3444 (diff)
downloadmariadb-git-fcbd3989243ec6b0505f8665fc6850f1449afb14.tar.gz
Cleanup: Remove unused log_cmdq_key
There was an intention to add a CommandQueue in mysql/mysql-server@eca5b0fc17a5bd6d4833d35a0d08c8549dd3b5ec but it never appeared in any release (not even MySQL 5.7.3 where that commit appeared).
-rw-r--r--storage/innobase/handler/ha_innodb.cc1
-rw-r--r--storage/innobase/include/univ.i3
2 files changed, 1 insertions, 3 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
index acc5e3355da..9d20bdef6ce 100644
--- a/storage/innobase/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
@@ -527,7 +527,6 @@ mysql_pfs_key_t ibuf_bitmap_mutex_key;
mysql_pfs_key_t ibuf_mutex_key;
mysql_pfs_key_t ibuf_pessimistic_insert_mutex_key;
mysql_pfs_key_t log_sys_mutex_key;
-mysql_pfs_key_t log_cmdq_mutex_key;
mysql_pfs_key_t log_flush_order_mutex_key;
mysql_pfs_key_t recalc_pool_mutex_key;
mysql_pfs_key_t purge_sys_pq_mutex_key;
diff --git a/storage/innobase/include/univ.i b/storage/innobase/include/univ.i
index 88f0b2d185b..942dbd93a14 100644
--- a/storage/innobase/include/univ.i
+++ b/storage/innobase/include/univ.i
@@ -1,7 +1,7 @@
/*****************************************************************************
Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved.
-Copyright (c) 2013, 2021, MariaDB Corporation.
+Copyright (c) 2013, 2022, MariaDB Corporation.
Copyright (c) 2008, Google Inc.
Portions of this file contain modifications contributed and copyrighted by
@@ -548,7 +548,6 @@ extern mysql_pfs_key_t ibuf_bitmap_mutex_key;
extern mysql_pfs_key_t ibuf_mutex_key;
extern mysql_pfs_key_t ibuf_pessimistic_insert_mutex_key;
extern mysql_pfs_key_t log_sys_mutex_key;
-extern mysql_pfs_key_t log_cmdq_mutex_key;
extern mysql_pfs_key_t log_flush_order_mutex_key;
extern mysql_pfs_key_t recalc_pool_mutex_key;
extern mysql_pfs_key_t purge_sys_pq_mutex_key;