1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 10.2 into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä 2022-02-25 12:40:26 +02:00
commit 9ba385a50d
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
storage/innobase/handler/ha_innodb.cc
View File

@ -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()(

10
storage/innobase/sync/sync0debug.cc
View File

@ -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()(