~percona-core/percona-server/5.5

« back to all changes in this revision

Viewing changes to Percona-Server/storage/innobase/trx/trx0sys.c

  • Committer: jenkins at percona
  • Date: 2013-03-26 01:40:02 UTC
  • mfrom: (450.9.2 bug1131189)
  • Revision ID: jenkins@jenkins.percona.com-20130326014002-1m2hg8pt1b27chq2
MergeĀ lp:~akopytov/percona-server/bug1131189

Show diffs side-by-side

added added

removed removed

Lines of Context:
1319
1319
 
1320
1320
        trx_sys = mem_zalloc(sizeof(*trx_sys));
1321
1321
 
 
1322
        /* Allocate the trx descriptors array */
 
1323
        trx_sys->descriptors = ut_malloc(sizeof(trx_id_t) *
 
1324
                                         TRX_DESCR_ARRAY_INITIAL_SIZE);
 
1325
        trx_sys->descr_n_max = TRX_DESCR_ARRAY_INITIAL_SIZE;
 
1326
        trx_sys->descr_n_used = 0;
 
1327
 
1322
1328
        sys_header = trx_sysf_get(&mtr);
1323
1329
 
1324
1330
        trx_rseg_list_and_array_init(sys_header, ib_bh, &mtr);
1346
1352
 
1347
1353
                for (;;) {
1348
1354
 
1349
 
                        if (trx->conc_state != TRX_PREPARED) {
 
1355
                        if (trx->state != TRX_PREPARED) {
1350
1356
                                rows_to_undo += trx->undo_no;
1351
1357
                        }
1352
1358
 
2028
2034
        ut_a(UT_LIST_GET_LEN(trx_sys->view_list) == 0);
2029
2035
        ut_a(UT_LIST_GET_LEN(trx_sys->mysql_trx_list) == 0);
2030
2036
 
 
2037
        ut_ad(trx_sys->descr_n_used == 0);
 
2038
        ut_free(trx_sys->descriptors);
 
2039
 
2031
2040
        mem_free(trx_sys);
2032
2041
 
2033
2042
        trx_sys = NULL;