diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-14 17:25:25 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-14 17:25:25 +0300 |
| commit | 874f8f30f2319166ff08509937d4eab366607c6b (patch) | |
| tree | fe092349aca8363b009e6235dacd9816a29b93aa /storage/innobase/sync | |
| parent | be85d3e61bb4217453a6879cb28d9bd369ad17dd (diff) | |
| parent | 50999738eaed907cfd94b554582b5416e0107642 (diff) | |
| download | mariadb-git-874f8f30f2319166ff08509937d4eab366607c6b.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'storage/innobase/sync')
| -rw-r--r-- | storage/innobase/sync/sync0rw.cc | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/storage/innobase/sync/sync0rw.cc b/storage/innobase/sync/sync0rw.cc index ae9707bb0e5..658a0f906a7 100644 --- a/storage/innobase/sync/sync0rw.cc +++ b/storage/innobase/sync/sync0rw.cc @@ -2,7 +2,7 @@ Copyright (c) 1995, 2016, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2008, Google Inc. -Copyright (c) 2017, 2018, MariaDB Corporation. +Copyright (c) 2017, 2019, MariaDB Corporation. Portions of this file contain modifications contributed and copyrighted by Google, Inc. Those modifications are gratefully acknowledged and are described @@ -239,9 +239,6 @@ rw_lock_create_func( mutex_enter(&rw_lock_list_mutex); - ut_ad(UT_LIST_GET_FIRST(rw_lock_list) == NULL - || UT_LIST_GET_FIRST(rw_lock_list)->magic_n == RW_LOCK_MAGIC_N); - UT_LIST_ADD_FIRST(rw_lock_list, lock); mutex_exit(&rw_lock_list_mutex); @@ -269,12 +266,6 @@ rw_lock_free_func( UT_LIST_REMOVE(rw_lock_list, lock); mutex_exit(&rw_lock_list_mutex); - - /* We did an in-place new in rw_lock_create_func() */ - ut_d(lock->~rw_lock_t()); - /* Sometimes (maybe when compiled with GCC -O3) the above call - to rw_lock_t::~rw_lock_t() will not actually assign magic_n=0. */ - ut_d(lock->magic_n = 0); } /******************************************************************//** @@ -862,7 +853,6 @@ rw_lock_validate( lock_word = my_atomic_load32_explicit(const_cast<int32_t*>(&lock->lock_word), MY_MEMORY_ORDER_RELAXED); - ut_ad(lock->magic_n == RW_LOCK_MAGIC_N); ut_ad(my_atomic_load32_explicit(const_cast<int32_t*>(&lock->waiters), MY_MEMORY_ORDER_RELAXED) < 2); ut_ad(lock_word > -(2 * X_LOCK_DECR)); |