diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-13 11:45:05 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-13 11:45:05 +0300 |
| commit | 15fa70b8408a2146b300a4e1b19819addafa5929 (patch) | |
| tree | 228e88d1e8e3b3d46f5a54ab6e1bdcdd4478b82e /storage/innobase/sync/sync0sync.cc | |
| parent | 19d4e023c681ecb26acf06318e69ecae6c4ec9be (diff) | |
| parent | 6bc4444d7ca81786de98f27669891692c2d2e21c (diff) | |
| download | mariadb-git-15fa70b8408a2146b300a4e1b19819addafa5929.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'storage/innobase/sync/sync0sync.cc')
| -rw-r--r-- | storage/innobase/sync/sync0sync.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/sync/sync0sync.cc b/storage/innobase/sync/sync0sync.cc index 6b293fb55f1..c52064c7bb9 100644 --- a/storage/innobase/sync/sync0sync.cc +++ b/storage/innobase/sync/sync0sync.cc @@ -2,6 +2,7 @@ Copyright (c) 1995, 2016, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2008, Google Inc. +Copyright (c) 2020, MariaDB Corporation. Portions of this file contain modifications contributed and copyrighted by Google, Inc. Those modifications are gratefully acknowledged and are described @@ -72,7 +73,6 @@ mysql_pfs_key_t rw_lock_debug_mutex_key; mysql_pfs_key_t rtr_active_mutex_key; mysql_pfs_key_t rtr_match_mutex_key; mysql_pfs_key_t rtr_path_mutex_key; -mysql_pfs_key_t rtr_ssn_mutex_key; mysql_pfs_key_t rw_lock_list_mutex_key; mysql_pfs_key_t rw_lock_mutex_key; mysql_pfs_key_t srv_innodb_monitor_mutex_key; |