← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/trx/trx0trx.c

Merge Stewart - Update innobase plugin to be based on innodb 1.1.4 from MySQL 5.5.8 

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/trx/trx0trx.c
124
124
        trx->table_id = 0;
125
125
 
126
126
        trx->mysql_thd = NULL;
127
 
        trx->active_trans = 0;
128
127
        trx->duplicates = 0;
129
128
 
130
129
        trx->mysql_n_tables_locked = 0;
746
745
                mutex_enter(&(rseg->mutex));
747
746
 
748
747
                if (trx->insert_undo != NULL) {
749
 
                        trx_undo_set_state_at_finish(
750
 
                                rseg, trx, trx->insert_undo, &mtr);
 
748
                        trx_undo_set_state_at_finish(trx->insert_undo, &mtr);
751
749
                }
752
750
 
753
751
                undo = trx->update_undo;
762
760
                        transaction commit for this transaction. */
763
761
 
764
762
                        update_hdr_page = trx_undo_set_state_at_finish(
765
 
                                rseg, trx, undo, &mtr);
 
763
                                undo, &mtr);
766
764
 
767
765
                        /* We have to do the cleanup for the update log while
768
766
                        holding the rseg mutex because update log headers