diff options
Diffstat (limited to 'storage/innobase/row/row0ins.cc')
| -rw-r--r-- | storage/innobase/row/row0ins.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/storage/innobase/row/row0ins.cc b/storage/innobase/row/row0ins.cc index 22e15e41096..9835e6b0afe 100644 --- a/storage/innobase/row/row0ins.cc +++ b/storage/innobase/row/row0ins.cc @@ -671,7 +671,7 @@ row_ins_set_detailed( { ut_ad(!srv_read_only_mode); - mutex_enter(&srv_misc_tmpfile_mutex); + mysql_mutex_lock(&srv_misc_tmpfile_mutex); rewind(srv_misc_tmpfile); if (os_file_set_eof(srv_misc_tmpfile)) { @@ -685,7 +685,7 @@ row_ins_set_detailed( trx_set_detailed_error(trx, "temp file operation failed"); } - mutex_exit(&srv_misc_tmpfile_mutex); + mysql_mutex_unlock(&srv_misc_tmpfile_mutex); } /*********************************************************************//** @@ -704,13 +704,13 @@ row_ins_foreign_trx_print( ut_ad(!srv_read_only_mode); - mysql_mutex_lock(&lock_sys.mutex); + lock_sys.mutex_lock(); n_rec_locks = lock_number_of_rows_locked(&trx->lock); n_trx_locks = UT_LIST_GET_LEN(trx->lock.trx_locks); heap_size = mem_heap_get_size(trx->lock.lock_heap); - mysql_mutex_unlock(&lock_sys.mutex); + lock_sys.mutex_unlock(); - mutex_enter(&dict_foreign_err_mutex); + mysql_mutex_lock(&dict_foreign_err_mutex); rewind(dict_foreign_err_file); ut_print_timestamp(dict_foreign_err_file); fputs(" Transaction:\n", dict_foreign_err_file); @@ -718,7 +718,7 @@ row_ins_foreign_trx_print( trx_print_low(dict_foreign_err_file, trx, 600, n_rec_locks, n_trx_locks, heap_size); - ut_ad(mutex_own(&dict_foreign_err_mutex)); + mysql_mutex_assert_owner(&dict_foreign_err_mutex); } /*********************************************************************//** @@ -776,7 +776,7 @@ row_ins_foreign_report_err( } putc('\n', ef); - mutex_exit(&dict_foreign_err_mutex); + mysql_mutex_unlock(&dict_foreign_err_mutex); } /*********************************************************************//** @@ -842,7 +842,7 @@ row_ins_foreign_report_add_err( } putc('\n', ef); - mutex_exit(&dict_foreign_err_mutex); + mysql_mutex_unlock(&dict_foreign_err_mutex); } /*********************************************************************//** @@ -1598,7 +1598,7 @@ row_ins_check_foreign_constraint( err = DB_ROW_IS_REFERENCED; } - mutex_exit(&dict_foreign_err_mutex); + mysql_mutex_unlock(&dict_foreign_err_mutex); goto exit_func; } @@ -3009,9 +3009,9 @@ row_ins_sec_index_entry_low( if (!index->is_committed()) { ut_ad(!thr_get_trx(thr) ->dict_operation_lock_mode); - mutex_enter(&dict_sys.mutex); + dict_sys.mutex_lock(); dict_set_corrupted_index_cache_only(index); - mutex_exit(&dict_sys.mutex); + dict_sys.mutex_unlock(); /* Do not return any error to the caller. The duplicate will be reported by ALTER TABLE or CREATE UNIQUE INDEX. |