← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/handler/ha_innodb.cc

  • Committer: Brian Aker
  • Date: 2010-03-11 16:25:44 UTC
  • mfrom: (1333.1.2 bug534806)
  • Revision ID: brian@gaz-20100311162544-p6d3zzg0v7nslfbb
Merge Jay

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/ha_innodb.cc
2323
2323
 
2324
2324
        innobase_release_stat_resources(trx);
2325
2325
 
2326
 
        /* TODO: use provided savepoint data area to store savepoint data */
2327
2326
        error= (int)trx_rollback_to_savepoint_for_mysql(trx, named_savepoint.getName().c_str(),
2328
2327
                                                        &mysql_binlog_cache_pos);
2329
2328
        return(convert_error_code_to_mysql(error, 0, NULL));
2347
2346
 
2348
2347
        trx = check_trx_exists(session);
2349
2348
 
2350
 
        /* TODO: use provided savepoint data area to store savepoint data */
2351
2349
        error = (int) trx_release_savepoint_for_mysql(trx, named_savepoint.getName().c_str());
2352
2350
 
2353
2351
        return(convert_error_code_to_mysql(error, 0, NULL));
2384
2382
        /* cannot happen outside of transaction */
2385
2383
        assert(trx->conc_state != TRX_NOT_STARTED);
2386
2384
 
2387
 
        /* TODO: use provided savepoint data area to store savepoint data */
2388
2385
        error = (int) trx_savepoint_for_mysql(trx, named_savepoint.getName().c_str(), (ib_int64_t)0);
2389
2386
 
2390
2387
        return(convert_error_code_to_mysql(error, 0, NULL));