diff options
Diffstat (limited to 'storage/innobase/dict/dict0crea.cc')
| -rw-r--r-- | storage/innobase/dict/dict0crea.cc | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/storage/innobase/dict/dict0crea.cc b/storage/innobase/dict/dict0crea.cc index a57d06d127a..563a37181fd 100644 --- a/storage/innobase/dict/dict0crea.cc +++ b/storage/innobase/dict/dict0crea.cc @@ -343,7 +343,7 @@ dict_build_table_def_step( que_thr_t* thr, /*!< in: query thread */ tab_node_t* node) /*!< in: table create node */ { - ut_ad(mutex_own(&dict_sys.mutex)); + dict_sys.assert_locked(); dict_table_t* table = node->table; trx_t* trx = thr_get_trx(thr); ut_ad(!table->is_temporary()); @@ -483,7 +483,7 @@ dict_create_sys_indexes_tuple( dfield_t* dfield; byte* ptr; - ut_ad(mutex_own(&dict_sys.mutex)); + dict_sys.assert_locked(); ut_ad(index); ut_ad(index->table->space || index->table->file_unreadable); ut_ad(!index->table->space @@ -712,7 +712,7 @@ dict_build_index_def_step( dtuple_t* row; trx_t* trx; - ut_ad(mutex_own(&dict_sys.mutex)); + dict_sys.assert_locked(); trx = thr_get_trx(thr); @@ -763,7 +763,7 @@ dict_build_index_def( dict_index_t* index, /*!< in/out: index */ trx_t* trx) /*!< in/out: InnoDB transaction handle */ { - ut_ad(mutex_own(&dict_sys.mutex)); + dict_sys.assert_locked(); if (trx->table_id == 0) { /* Record only the first table id. */ @@ -811,7 +811,7 @@ dict_create_index_tree_step( dict_index_t* index; dtuple_t* search_tuple; - ut_ad(mutex_own(&dict_sys.mutex)); + dict_sys.assert_locked(); index = node->index; @@ -880,7 +880,7 @@ dict_create_index_tree_in_mem( { mtr_t mtr; - ut_ad(mutex_own(&dict_sys.mutex)); + dict_sys.assert_locked(); ut_ad(!(index->type & DICT_FTS)); mtr_start(&mtr); @@ -910,7 +910,7 @@ void dict_drop_index_tree(btr_pcur_t* pcur, trx_t* trx, mtr_t* mtr) byte* ptr; ulint len; - ut_ad(mutex_own(&dict_sys.mutex)); + dict_sys.assert_locked(); ut_a(!dict_table_is_comp(dict_sys.sys_indexes)); ptr = rec_get_nth_field_old(rec, DICT_FLD__SYS_INDEXES__PAGE_NO, &len); @@ -1056,7 +1056,7 @@ dict_create_table_step( trx_t* trx; ut_ad(thr); - ut_ad(mutex_own(&dict_sys.mutex)); + dict_sys.assert_locked(); trx = thr_get_trx(thr); @@ -1199,7 +1199,7 @@ dict_create_index_step( trx_t* trx; ut_ad(thr); - ut_ad(mutex_own(&dict_sys.mutex)); + dict_sys.assert_locked(); trx = thr_get_trx(thr); @@ -1359,7 +1359,7 @@ dict_check_if_system_table_exists( ut_ad(!srv_any_background_activity()); - mutex_enter(&dict_sys.mutex); + dict_sys.mutex_lock(); sys_table = dict_table_get_low(tablename); @@ -1377,7 +1377,7 @@ dict_check_if_system_table_exists( dict_table_prevent_eviction(sys_table); } - mutex_exit(&dict_sys.mutex); + dict_sys.mutex_unlock(); return(error); } @@ -1545,9 +1545,9 @@ dict_create_or_check_sys_virtual() "SYS_VIRTUAL", DICT_NUM_FIELDS__SYS_VIRTUAL + 1, 1); if (err == DB_SUCCESS) { - mutex_enter(&dict_sys.mutex); + dict_sys.mutex_lock(); dict_sys.sys_virtual = dict_table_get_low("SYS_VIRTUAL"); - mutex_exit(&dict_sys.mutex); + dict_sys.mutex_unlock(); return(DB_SUCCESS); } @@ -1620,9 +1620,9 @@ dict_create_or_check_sys_virtual() dberr_t sys_virtual_err = dict_check_if_system_table_exists( "SYS_VIRTUAL", DICT_NUM_FIELDS__SYS_VIRTUAL + 1, 1); ut_a(sys_virtual_err == DB_SUCCESS); - mutex_enter(&dict_sys.mutex); + dict_sys.mutex_lock(); dict_sys.sys_virtual = dict_table_get_low("SYS_VIRTUAL"); - mutex_exit(&dict_sys.mutex); + dict_sys.mutex_unlock(); return(err); } @@ -1646,7 +1646,7 @@ dict_foreign_eval_sql( error = que_eval_sql(info, sql, FALSE, trx); if (error == DB_DUPLICATE_KEY) { - mutex_enter(&dict_foreign_err_mutex); + mysql_mutex_lock(&dict_foreign_err_mutex); rewind(ef); ut_print_timestamp(ef); fputs(" Error in foreign key constraint creation for table ", @@ -1666,7 +1666,7 @@ dict_foreign_eval_sql( "explicitly with unique names.\n", ef); - mutex_exit(&dict_foreign_err_mutex); + mysql_mutex_unlock(&dict_foreign_err_mutex); return(error); } @@ -1675,7 +1675,7 @@ dict_foreign_eval_sql( ib::error() << "Foreign key constraint creation failed: " << error; - mutex_enter(&dict_foreign_err_mutex); + mysql_mutex_lock(&dict_foreign_err_mutex); ut_print_timestamp(ef); fputs(" Internal error in foreign key constraint creation" " for table ", ef); @@ -1683,7 +1683,7 @@ dict_foreign_eval_sql( fputs(".\n" "See the MySQL .err log in the datadir" " for more information.\n", ef); - mutex_exit(&dict_foreign_err_mutex); + mysql_mutex_unlock(&dict_foreign_err_mutex); return(error); } @@ -2019,7 +2019,7 @@ dict_create_add_foreigns_to_dictionary( dict_foreign_t* foreign; dberr_t error; - ut_ad(mutex_own(&dict_sys.mutex)); + dict_sys.assert_locked(); if (NULL == dict_table_get_low("SYS_FOREIGN")) { |