diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-02-25 12:40:26 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-02-25 12:40:26 +0200 |
| commit | 9ba385a50d0cd611fce61462fc3e03e82b1ffee9 (patch) | |
| tree | 6d07c515be93493737519e281218d7d6d3268f1d /storage | |
| parent | 00b70bbb51b9f2a3646c1ceedc6a27eeb1bdd6ac (diff) | |
| parent | ed691eca99da36f3c20558edd08786224539a7ab (diff) | |
| download | mariadb-git-9ba385a50d0cd611fce61462fc3e03e82b1ffee9.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 2 | ||||
| -rw-r--r-- | storage/innobase/sync/sync0debug.cc | 10 |
2 files changed, 2 insertions, 10 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 4c7e2c6ade7..a128d7fb0bc 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -16159,7 +16159,7 @@ struct ShowStatus { }; /** Order by m_waits, in descending order. */ - struct OrderByWaits: public std::binary_function<Value, Value, bool> + struct OrderByWaits { /** @return true if rhs < lhs */ bool operator()( diff --git a/storage/innobase/sync/sync0debug.cc b/storage/innobase/sync/sync0debug.cc index f576ec6acca..f4370cd478b 100644 --- a/storage/innobase/sync/sync0debug.cc +++ b/storage/innobase/sync/sync0debug.cc @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 2014, 2016, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2017, 2020, MariaDB Corporation. +Copyright (c) 2017, 2022, MariaDB Corporation. Portions of this file contain modifications contributed and copyrighted by Google, Inc. Those modifications are gratefully acknowledged and are described @@ -101,10 +101,6 @@ struct LatchDebug { /** Comparator for the ThreadMap. */ struct os_thread_id_less - : public std::binary_function< - os_thread_id_t, - os_thread_id_t, - bool> { /** @return true if lhs < rhs */ bool operator()( @@ -390,10 +386,6 @@ private: private: /** Comparator for the Levels . */ struct latch_level_less - : public std::binary_function< - latch_level_t, - latch_level_t, - bool> { /** @return true if lhs < rhs */ bool operator()( |