summaryrefslogtreecommitdiff
path: root/storage/innobase
diff options
context:
space:
mode:
Diffstat (limited to 'storage/innobase')
-rw-r--r--storage/innobase/CMakeLists.txt6
-rw-r--r--storage/innobase/handler/ha_innodb.cc6
-rw-r--r--storage/innobase/include/buf0buf.h14
-rw-r--r--storage/innobase/include/dict0types.h2
-rw-r--r--storage/innobase/include/ib0mutex.h2
-rw-r--r--storage/innobase/include/rem0rec.h2
-rw-r--r--storage/innobase/include/row0mysql.h2
-rw-r--r--storage/innobase/include/sync0types.h4
-rw-r--r--storage/innobase/include/trx0purge.h2
-rw-r--r--storage/innobase/include/ut0mutex.h4
-rw-r--r--storage/innobase/include/ut0new.h2
-rw-r--r--storage/innobase/include/ut0ut.h2
-rw-r--r--storage/innobase/row/row0import.cc6
-rw-r--r--storage/innobase/trx/trx0trx.cc4
14 files changed, 24 insertions, 34 deletions
diff --git a/storage/innobase/CMakeLists.txt b/storage/innobase/CMakeLists.txt
index 2e7b99fa228..b41b4389d21 100644
--- a/storage/innobase/CMakeLists.txt
+++ b/storage/innobase/CMakeLists.txt
@@ -94,12 +94,6 @@ IF(WITH_INNODB_EXTRA_DEBUG)
ENDIF()
ADD_FEATURE_INFO(INNODB_EXTRA_DEBUG WITH_INNODB_EXTRA_DEBUG "Extra InnoDB debug checks")
-
-CHECK_FUNCTION_EXISTS(sched_getcpu HAVE_SCHED_GETCPU)
-IF(HAVE_SCHED_GETCPU)
- ADD_DEFINITIONS(-DHAVE_SCHED_GETCPU=1)
-ENDIF()
-
CHECK_FUNCTION_EXISTS(nanosleep HAVE_NANOSLEEP)
IF(HAVE_NANOSLEEP)
ADD_DEFINITIONS(-DHAVE_NANOSLEEP=1)
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
index fe1df40face..f359f843049 100644
--- a/storage/innobase/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
@@ -2582,10 +2582,8 @@ ha_innobase::ha_innobase(
/*********************************************************************//**
Destruct ha_innobase handler. */
-ha_innobase::~ha_innobase()
+ha_innobase::~ha_innobase() = default;
/*======================*/
-{
-}
/*********************************************************************//**
Updates the user_thd field in a handle and also allocates a new InnoDB
@@ -16068,7 +16066,7 @@ struct ShowStatus {
};
/** Constructor */
- ShowStatus() { }
+ ShowStatus() = default;
/** Callback for collecting the stats
@param[in] latch_meta Latch meta data
diff --git a/storage/innobase/include/buf0buf.h b/storage/innobase/include/buf0buf.h
index 17d6d10f8b7..a84ea047a54 100644
--- a/storage/innobase/include/buf0buf.h
+++ b/storage/innobase/include/buf0buf.h
@@ -1236,7 +1236,7 @@ even after we release the buffer pool mutex. */
class HazardPointer
{
public:
- virtual ~HazardPointer() {}
+ virtual ~HazardPointer() = default;
/** @return current value */
buf_page_t *get() const { mysql_mutex_assert_owner(m_mutex); return m_hp; }
@@ -1275,16 +1275,15 @@ protected:
class FlushHp : public HazardPointer
{
public:
- ~FlushHp() override {}
+ ~FlushHp() override = default;
/** Adjust the value of hp. This happens when some
other thread working on the same list attempts to
remove the hp from the list.
@param bpage buffer block to be compared */
+ MY_ATTRIBUTE((nonnull))
void adjust(const buf_page_t *bpage) override
{
- ut_ad(bpage != NULL);
-
/* We only support reverse traversal for now. */
if (is_hp(bpage))
m_hp= UT_LIST_GET_PREV(list, m_hp);
@@ -1296,15 +1295,15 @@ public:
/** Class implementing buf_pool.LRU hazard pointer */
class LRUHp : public HazardPointer {
public:
- ~LRUHp() override {}
+ ~LRUHp() override = default;
/** Adjust the value of hp. This happens when some
other thread working on the same list attempts to
remove the hp from the list.
@param bpage buffer block to be compared */
+ MY_ATTRIBUTE((nonnull))
void adjust(const buf_page_t *bpage) override
{
- ut_ad(bpage);
/** We only support reverse traversal for now. */
if (is_hp(bpage))
m_hp= UT_LIST_GET_PREV(LRU, m_hp);
@@ -1319,8 +1318,7 @@ itr in that position and the other thread can start scan from
there */
class LRUItr : public LRUHp {
public:
- LRUItr() : LRUHp() {}
- ~LRUItr() override {}
+ ~LRUItr() override = default;
/** Select from where to start a scan. If we have scanned
too deep into the LRU list it resets the value to the tail
diff --git a/storage/innobase/include/dict0types.h b/storage/innobase/include/dict0types.h
index 76ffef236a1..5c4aaf8c87a 100644
--- a/storage/innobase/include/dict0types.h
+++ b/storage/innobase/include/dict0types.h
@@ -109,7 +109,7 @@ struct table_name_t
char* m_name;
/** Default constructor */
- table_name_t() {}
+ table_name_t() = default;
/** Constructor */
table_name_t(char* name) : m_name(name) {}
diff --git a/storage/innobase/include/ib0mutex.h b/storage/innobase/include/ib0mutex.h
index 862ce79cb7b..129565a4c5c 100644
--- a/storage/innobase/include/ib0mutex.h
+++ b/storage/innobase/include/ib0mutex.h
@@ -538,7 +538,7 @@ struct PolicyMutex
#endif /* UNIV_PFS_MUTEX */
}
- ~PolicyMutex() { }
+ ~PolicyMutex() = default;
/** @return non-const version of the policy */
Policy& policy() UNIV_NOTHROW
diff --git a/storage/innobase/include/rem0rec.h b/storage/innobase/include/rem0rec.h
index c2ebad91ecd..a179c313235 100644
--- a/storage/innobase/include/rem0rec.h
+++ b/storage/innobase/include/rem0rec.h
@@ -1246,7 +1246,7 @@ public:
}
/** Destructor */
- ~rec_printer() override {}
+ ~rec_printer() override = default;
private:
/** Copy constructor */
diff --git a/storage/innobase/include/row0mysql.h b/storage/innobase/include/row0mysql.h
index e3f7ea7d701..eb90ec0f04c 100644
--- a/storage/innobase/include/row0mysql.h
+++ b/storage/innobase/include/row0mysql.h
@@ -824,7 +824,7 @@ struct row_prebuilt_t {
/** Callback for row_mysql_sys_index_iterate() */
struct SysIndexCallback {
- virtual ~SysIndexCallback() { }
+ virtual ~SysIndexCallback() = default;
/** Callback method
@param mtr current mini transaction
diff --git a/storage/innobase/include/sync0types.h b/storage/innobase/include/sync0types.h
index 8ad99700fa5..d7c48bf10e4 100644
--- a/storage/innobase/include/sync0types.h
+++ b/storage/innobase/include/sync0types.h
@@ -347,7 +347,7 @@ struct OSMutex {
}
/** Destructor */
- ~OSMutex() { }
+ ~OSMutex() = default;
/** Destroy the mutex */
void destroy()
@@ -698,7 +698,7 @@ public:
}
/** Destructor */
- ~LatchMeta() { }
+ ~LatchMeta() = default;
/** Constructor
@param[in] id Latch id
diff --git a/storage/innobase/include/trx0purge.h b/storage/innobase/include/trx0purge.h
index ef94207617d..14cf6a2958b 100644
--- a/storage/innobase/include/trx0purge.h
+++ b/storage/innobase/include/trx0purge.h
@@ -60,7 +60,7 @@ public:
typedef trx_rsegs_t::iterator iterator;
typedef trx_rsegs_t::const_iterator const_iterator;
- TrxUndoRsegs() {}
+ TrxUndoRsegs() = default;
/** Constructor */
TrxUndoRsegs(trx_rseg_t& rseg)
diff --git a/storage/innobase/include/ut0mutex.h b/storage/innobase/include/ut0mutex.h
index 2f9bb5b75fc..8eef2d96fde 100644
--- a/storage/innobase/include/ut0mutex.h
+++ b/storage/innobase/include/ut0mutex.h
@@ -99,10 +99,10 @@ in the debug version. */
class MutexMonitor {
public:
/** Constructor */
- MutexMonitor() { }
+ MutexMonitor() = default;
/** Destructor */
- ~MutexMonitor() { }
+ ~MutexMonitor() = default;
/** Enable the mutex monitoring */
void enable();
diff --git a/storage/innobase/include/ut0new.h b/storage/innobase/include/ut0new.h
index e8469db9dc3..4c8d2cf7a61 100644
--- a/storage/innobase/include/ut0new.h
+++ b/storage/innobase/include/ut0new.h
@@ -285,7 +285,7 @@ public:
{
}
#else
- ut_allocator() {}
+ ut_allocator() = default;
ut_allocator(PSI_memory_key) {}
#endif /* UNIV_PFS_MEMORY */
diff --git a/storage/innobase/include/ut0ut.h b/storage/innobase/include/ut0ut.h
index 4ae4739ecfc..369f3f8c5d3 100644
--- a/storage/innobase/include/ut0ut.h
+++ b/storage/innobase/include/ut0ut.h
@@ -332,7 +332,7 @@ class logger
{
protected:
/* This class must not be used directly */
- ATTRIBUTE_COLD ATTRIBUTE_NOINLINE logger() {}
+ ATTRIBUTE_COLD ATTRIBUTE_NOINLINE logger() = default;
public:
template<typename T> ATTRIBUTE_COLD ATTRIBUTE_NOINLINE
logger& operator<<(const T& rhs)
diff --git a/storage/innobase/row/row0import.cc b/storage/innobase/row/row0import.cc
index 1737d8c7ce9..872e95c91a3 100644
--- a/storage/innobase/row/row0import.cc
+++ b/storage/innobase/row/row0import.cc
@@ -355,8 +355,8 @@ public:
<< index->name;
}
- /** Descructor */
- ~IndexPurge() UNIV_NOTHROW { }
+ /** Destructor */
+ ~IndexPurge() UNIV_NOTHROW = default;
/** Purge delete marked records.
@return DB_SUCCESS or error code. */
@@ -705,7 +705,7 @@ struct FetchIndexRootPages : public AbstractCallback {
m_table(table), m_index(0, 0) UNIV_NOTHROW { }
/** Destructor */
- ~FetchIndexRootPages() UNIV_NOTHROW override { }
+ ~FetchIndexRootPages() UNIV_NOTHROW override = default;
/** Fetch the clustered index root page in the tablespace
@param iter Tablespace iterator
diff --git a/storage/innobase/trx/trx0trx.cc b/storage/innobase/trx/trx0trx.cc
index 54783e2d1a0..6effe925050 100644
--- a/storage/innobase/trx/trx0trx.cc
+++ b/storage/innobase/trx/trx0trx.cc
@@ -257,7 +257,7 @@ struct TrxFactory {
/** The lock strategy for TrxPool */
struct TrxPoolLock {
- TrxPoolLock() { }
+ TrxPoolLock() = default;
/** Create the mutex */
void create()
@@ -280,7 +280,7 @@ struct TrxPoolLock {
/** The lock strategy for the TrxPoolManager */
struct TrxPoolManagerLock {
- TrxPoolManagerLock() { }
+ TrxPoolManagerLock() = default;
/** Create the mutex */
void create()
View Lorry Controller Status