← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/log/log0recv.c

[patch 046/129] Merge patch for revision 1834 from InnoDB SVN:
revno: 1834
revision-id: svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:5826
parent: svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:5825
committer: marko
timestamp: Thu 2009-09-10 10:29:46 +0000
message:
  branches/zip: Roll back recovered dictionary transactions before
  dropping incomplete indexes (Issue #337).
  
  trx_rollback_or_clean_recovered(ibool all): New function, split from
  trx_rollback_or_clean_all_recovered().  all==FALSE will only roll back
  dictionary transactions.
  
  recv_recovery_from_checkpoint_finish(): Call
  trx_rollback_or_clean_recovered(FALSE) before
  row_merge_drop_temp_indexes().
  
  rb://158 approved by Sunny Bains
modified:
  include/trx0roll.h             2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Finclude%2Ftrx0roll.h
  log/log0recv.c                 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Flog%2Flog0recv.c
  trx/trx0roll.c                 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Ftrx%2Ftrx0roll.c
diff:
=== modified file 'include/trx0roll.h'

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/log/log0recv.c
3118
3118
#ifndef UNIV_LOG_DEBUG
3119
3119
        recv_sys_free();
3120
3120
#endif
 
3121
        /* Roll back any recovered data dictionary transactions, so
 
3122
        that the data dictionary tables will be free of any locks.
 
3123
        The data dictionary latch should guarantee that there is at
 
3124
        most one data dictionary transaction active at a time. */
 
3125
        trx_rollback_or_clean_recovered(FALSE);
3121
3126
 
3122
3127
        /* Drop partially created indexes. */
3123
3128
        row_merge_drop_temp_indexes();