Commit cd970f71 authored by marko's avatar marko

branches/zip: recv_recovery_rollback_active():

Drop the temporary tables and indexes after enabling sync order checks.
This should not make any difference. This could have been done in r6611.
parent 72760cd7
...@@ -3270,11 +3270,6 @@ recv_recovery_rollback_active(void) ...@@ -3270,11 +3270,6 @@ recv_recovery_rollback_active(void)
{ {
int i; int i;
/* Drop partially created indexes. */
row_merge_drop_temp_indexes();
/* Drop temporary tables. */
row_mysql_drop_temp_tables();
#ifdef UNIV_SYNC_DEBUG #ifdef UNIV_SYNC_DEBUG
/* Wait for a while so that created threads have time to suspend /* Wait for a while so that created threads have time to suspend
themselves before we switch the latching order checks on */ themselves before we switch the latching order checks on */
...@@ -3283,6 +3278,11 @@ recv_recovery_rollback_active(void) ...@@ -3283,6 +3278,11 @@ recv_recovery_rollback_active(void)
/* Switch latching order checks on in sync0sync.c */ /* Switch latching order checks on in sync0sync.c */
sync_order_checks_on = TRUE; sync_order_checks_on = TRUE;
#endif #endif
/* Drop partially created indexes. */
row_merge_drop_temp_indexes();
/* Drop temporary tables. */
row_mysql_drop_temp_tables();
if (srv_force_recovery < SRV_FORCE_NO_TRX_UNDO) { if (srv_force_recovery < SRV_FORCE_NO_TRX_UNDO) {
/* Rollback the uncommitted transactions which have no user /* Rollback the uncommitted transactions which have no user
session */ session */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment