mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 06:44:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

branches/zip: ha_innobase::add_index(): Allocate a new transaction for

Browse source 
the dictionary operations.

TODO: ha_innobase::final_drop_index() should do the same, and set
trx->dict_operation as well.
This commit is contained in:
marko 2007-09-06 12:43:29 +00:00
parent 55e009428e
commit 0a2e8d97be
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
handler/ha_innodb.cc
View file

@ -8260,9 +8260,11 @@ ha_innobase::add_index(
heap = mem_heap_create(1024); heap = mem_heap_create(1024);
trx = check_trx_exists(user_thd); /* In case MySQL calls this in the middle of a SELECT query, release
trx_search_latch_release_if_reserved(trx); possible adaptive hash latch to avoid deadlocks of threads. */
trx_search_latch_release_if_reserved(check_trx_exists(user_thd));
trx = trx_allocate_for_mysql();
trx_start_if_not_started(trx); trx_start_if_not_started(trx);
innobase_register_stmt(ht, user_thd); innobase_register_stmt(ht, user_thd);
@ -8282,6 +8284,7 @@ ha_innobase::add_index(
err_exit: err_exit:
mem_heap_free(heap); mem_heap_free(heap);
trx_general_rollback_for_mysql(trx, FALSE, NULL); trx_general_rollback_for_mysql(trx, FALSE, NULL);
trx_free_for_mysql(trx);
DBUG_RETURN(error); DBUG_RETURN(error);
} }
@ -8506,6 +8509,8 @@ convert_error:
row_mysql_unlock_data_dictionary(trx); row_mysql_unlock_data_dictionary(trx);
} }
trx_free_for_mysql(trx);
/* There might be work for utility threads.*/ /* There might be work for utility threads.*/
srv_active_wake_master_thread(); srv_active_wake_master_thread();