1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed dependency no longer correct

Browse Source
This commit is contained in:
Mikael Ronstrom 2011-01-12 14:44:25 +01:00
parent 773267552f
commit fc12800c05
3 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
storage/innobase/row/row0merge.c
View File

@ -1929,7 +1929,6 @@ row_merge_lock_table(
sel_node_t* node; sel_node_t* node;
ut_ad(trx); ut_ad(trx);
ut_ad(trx->mysql_thread_id == os_thread_get_curr_id());
ut_ad(mode == LOCK_X || mode == LOCK_S); ut_ad(mode == LOCK_X || mode == LOCK_S);
heap = mem_heap_create(512); heap = mem_heap_create(512);
@ -2366,7 +2365,6 @@ row_merge_rename_tables(
pars_info_t* info; pars_info_t* info;
char old_name[MAX_TABLE_NAME_LEN + 1]; char old_name[MAX_TABLE_NAME_LEN + 1];
ut_ad(trx->mysql_thread_id == os_thread_get_curr_id());
ut_ad(old_table != new_table); ut_ad(old_table != new_table);
ut_ad(mutex_own(&dict_sys->mutex)); ut_ad(mutex_own(&dict_sys->mutex));

14
storage/innobase/row/row0mysql.c
View File

@ -976,7 +976,6 @@ row_lock_table_autoinc_for_mysql(
ibool was_lock_wait; ibool was_lock_wait;
ut_ad(trx); ut_ad(trx);
ut_ad(trx->mysql_thread_id == os_thread_get_curr_id());
/* If we already hold an AUTOINC lock on the table then do nothing. /* If we already hold an AUTOINC lock on the table then do nothing.
Note: We peek at the value of the current owner without acquiring Note: We peek at the value of the current owner without acquiring
@ -1056,7 +1055,6 @@ row_lock_table_for_mysql(
ibool was_lock_wait; ibool was_lock_wait;
ut_ad(trx); ut_ad(trx);
ut_ad(trx->mysql_thread_id == os_thread_get_curr_id());
trx->op_info = "setting table lock"; trx->op_info = "setting table lock";
@ -1130,7 +1128,6 @@ row_insert_for_mysql(
ins_node_t* node = prebuilt->ins_node; ins_node_t* node = prebuilt->ins_node;
ut_ad(trx); ut_ad(trx);
ut_ad(trx->mysql_thread_id == os_thread_get_curr_id());
if (prebuilt->table->ibd_file_missing) { if (prebuilt->table->ibd_file_missing) {
ut_print_timestamp(stderr); ut_print_timestamp(stderr);
@ -1364,7 +1361,6 @@ row_update_for_mysql(
trx_t* trx = prebuilt->trx; trx_t* trx = prebuilt->trx;
ut_ad(prebuilt && trx); ut_ad(prebuilt && trx);
ut_ad(trx->mysql_thread_id == os_thread_get_curr_id());
UT_NOT_USED(mysql_rec); UT_NOT_USED(mysql_rec);
if (prebuilt->table->ibd_file_missing) { if (prebuilt->table->ibd_file_missing) {
@ -1532,7 +1528,6 @@ row_unlock_for_mysql(
trx_t* trx = prebuilt->trx; trx_t* trx = prebuilt->trx;
ut_ad(prebuilt && trx); ut_ad(prebuilt && trx);
ut_ad(trx->mysql_thread_id == os_thread_get_curr_id());
if (UNIV_UNLIKELY if (UNIV_UNLIKELY
(!srv_locks_unsafe_for_binlog (!srv_locks_unsafe_for_binlog
@ -1834,7 +1829,6 @@ row_create_table_for_mysql(
ulint table_name_len; ulint table_name_len;
ulint err; ulint err;
ut_ad(trx->mysql_thread_id == os_thread_get_curr_id());
#ifdef UNIV_SYNC_DEBUG #ifdef UNIV_SYNC_DEBUG
ut_ad(rw_lock_own(&dict_operation_lock, RW_LOCK_EX)); ut_ad(rw_lock_own(&dict_operation_lock, RW_LOCK_EX));
#endif /* UNIV_SYNC_DEBUG */ #endif /* UNIV_SYNC_DEBUG */
@ -2006,7 +2000,6 @@ row_create_index_for_mysql(
ut_ad(rw_lock_own(&dict_operation_lock, RW_LOCK_EX)); ut_ad(rw_lock_own(&dict_operation_lock, RW_LOCK_EX));
#endif /* UNIV_SYNC_DEBUG */ #endif /* UNIV_SYNC_DEBUG */
ut_ad(mutex_own(&(dict_sys->mutex))); ut_ad(mutex_own(&(dict_sys->mutex)));
ut_ad(trx->mysql_thread_id == os_thread_get_curr_id());
trx->op_info = "creating index"; trx->op_info = "creating index";
@ -2409,8 +2402,6 @@ row_discard_tablespace_for_mysql(
table->n_foreign_key_checks_running > 0, we do not allow the table->n_foreign_key_checks_running > 0, we do not allow the
discard. We also reserve the data dictionary latch. */ discard. We also reserve the data dictionary latch. */
ut_ad(trx->mysql_thread_id == os_thread_get_curr_id());
trx->op_info = "discarding tablespace"; trx->op_info = "discarding tablespace";
trx_start_if_not_started(trx); trx_start_if_not_started(trx);
@ -2569,8 +2560,6 @@ row_import_tablespace_for_mysql(
ib_uint64_t current_lsn; ib_uint64_t current_lsn;
ulint err = DB_SUCCESS; ulint err = DB_SUCCESS;
ut_ad(trx->mysql_thread_id == os_thread_get_curr_id());
trx_start_if_not_started(trx); trx_start_if_not_started(trx);
trx->op_info = "importing tablespace"; trx->op_info = "importing tablespace";
@ -2754,7 +2743,6 @@ row_truncate_table_for_mysql(
redo log records on the truncated tablespace, we will assign redo log records on the truncated tablespace, we will assign
a new tablespace identifier to the truncated tablespace. */ a new tablespace identifier to the truncated tablespace. */
ut_ad(trx->mysql_thread_id == os_thread_get_curr_id());
ut_ad(table); ut_ad(table);
if (srv_created_new_raw) { if (srv_created_new_raw) {
@ -3605,7 +3593,6 @@ row_drop_database_for_mysql(
int err = DB_SUCCESS; int err = DB_SUCCESS;
ulint namelen = strlen(name); ulint namelen = strlen(name);
ut_ad(trx->mysql_thread_id == os_thread_get_curr_id());
ut_a(name != NULL); ut_a(name != NULL);
ut_a(name[namelen - 1] == '/'); ut_a(name[namelen - 1] == '/');
@ -3775,7 +3762,6 @@ row_rename_table_for_mysql(
ibool old_is_tmp, new_is_tmp; ibool old_is_tmp, new_is_tmp;
pars_info_t* info = NULL; pars_info_t* info = NULL;
ut_ad(trx->mysql_thread_id == os_thread_get_curr_id());
ut_a(old_name != NULL); ut_a(old_name != NULL);
ut_a(new_name != NULL); ut_a(new_name != NULL);

1
storage/innobase/row/row0sel.c
View File

@ -3370,7 +3370,6 @@ row_search_for_mysql(
rec_offs_init(offsets_); rec_offs_init(offsets_);
ut_ad(index && pcur && search_tuple); ut_ad(index && pcur && search_tuple);
ut_ad(trx->mysql_thread_id == os_thread_get_curr_id());
if (UNIV_UNLIKELY(prebuilt->table->ibd_file_missing)) { if (UNIV_UNLIKELY(prebuilt->table->ibd_file_missing)) {
ut_print_timestamp(stderr); ut_print_timestamp(stderr);