← Back to branch summary

~jlukas79/+junk/mysql-server

« back to all changes in this revision

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

manual merge 6.0-main --> 6.0-bka-review

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/innobase/trx/trx0trx.c
757
757
                mutex_enter(&(rseg->mutex));
758
758
 
759
759
                if (trx->insert_undo != NULL) {
760
 
                        trx_undo_set_state_at_finish(trx, trx->insert_undo,
761
 
                                                     &mtr);
 
760
                        trx_undo_set_state_at_finish(
 
761
                                rseg, trx, trx->insert_undo, &mtr);
762
762
                }
763
763
 
764
764
                undo = trx->update_undo;
774
774
                        transaction commit for this transaction. */
775
775
 
776
776
                        update_hdr_page = trx_undo_set_state_at_finish(
777
 
                                trx, undo, &mtr);
 
777
                                rseg, trx, undo, &mtr);
778
778
 
779
779
                        /* We have to do the cleanup for the update log while
780
780
                        holding the rseg mutex because update log headers
933
933
        trx->rseg = NULL;
934
934
        trx->undo_no = ut_dulint_zero;
935
935
        trx->last_sql_stat_start.least_undo_no = ut_dulint_zero;
 
936
        trx->mysql_query_str = NULL;
936
937
 
937
938
        ut_ad(UT_LIST_GET_LEN(trx->wait_thrs) == 0);
938
939
        ut_ad(UT_LIST_GET_LEN(trx->trx_locks) == 0);