diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-05-06 09:57:39 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-05-06 09:57:39 +0200 |
| commit | e2e5d07b2807706fb9187f00c049474a01ab15da (patch) | |
| tree | 811b3c4d12a5a75af76fc88d793c3cdb17bf4414 /storage/innobase/include/sync0rw.ic | |
| parent | 3792693f311a90cf195ec6d2f9b3762255a249c7 (diff) | |
| parent | 83759e02dc12c8fb2576e240f307bc789e9c59cd (diff) | |
| download | mariadb-git-e2e5d07b2807706fb9187f00c049474a01ab15da.tar.gz | |
MDEV-6184 10.0.11 merge
InnoDB 5.6.16
Diffstat (limited to 'storage/innobase/include/sync0rw.ic')
| -rw-r--r-- | storage/innobase/include/sync0rw.ic | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/storage/innobase/include/sync0rw.ic b/storage/innobase/include/sync0rw.ic index 8786ad84643..1ddae5e6c58 100644 --- a/storage/innobase/include/sync0rw.ic +++ b/storage/innobase/include/sync0rw.ic @@ -380,8 +380,6 @@ rw_lock_x_lock_func_nowait( const char* file_name,/*!< in: file name where lock requested */ ulint line) /*!< in: line where requested */ { - os_thread_id_t curr_thread = os_thread_get_curr_id(); - ibool success; #ifdef INNODB_RW_LOCKS_USE_ATOMICS @@ -401,7 +399,8 @@ rw_lock_x_lock_func_nowait( rw_lock_set_writer_id_and_recursion_flag(lock, TRUE); } else if (lock->recursive - && os_thread_eq(lock->writer_thread, curr_thread)) { + && os_thread_eq(lock->writer_thread, + os_thread_get_curr_id())) { /* Relock: this lock_word modification is safe since no other threads can modify (lock, unlock, or reserve) lock_word while there is an exclusive writer and this is the writer thread. */ |