← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/transaction_services.cc

Refactor

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/transaction_services.cc
330
330
  }
331
331
 
332
332
  TransactionContext *trans= &session.transaction.stmt;
333
 
  ResourceContext& resource_context= *session.getResourceContext(monitored, 0);
 
333
  ResourceContext& resource_context= session.getResourceContext(*monitored, 0);
334
334
 
335
335
  if (resource_context.isStarted())
336
336
    return; /* already registered, return */
363
363
  }
364
364
 
365
365
  TransactionContext *trans= &session.transaction.stmt;
366
 
  ResourceContext& resource_context= *session.getResourceContext(monitored, 0);
 
366
  ResourceContext& resource_context= session.getResourceContext(*monitored, 0);
367
367
 
368
368
  if (resource_context.isStarted())
369
369
    return; /* already registered, return */
384
384
                                                         plugin::TransactionalStorageEngine *engine)
385
385
{
386
386
  TransactionContext *trans= &session.transaction.all;
387
 
  ResourceContext *resource_context= session.getResourceContext(monitored, 1);
 
387
  ResourceContext& resource_context= session.getResourceContext(*monitored, 1);
388
388
 
389
 
  if (resource_context->isStarted())
 
389
  if (resource_context.isStarted())
390
390
    return; /* already registered, return */
391
391
 
392
392
  session.server_status|= SERVER_STATUS_IN_TRANS;
393
393
 
394
 
  trans->registerResource(resource_context);
 
394
  trans->registerResource(&resource_context);
395
395
 
396
396
  assert(monitored->participatesInSqlTransaction());
397
397
  assert(not monitored->participatesInXaTransaction());
398
398
 
399
 
  resource_context->setMonitored(monitored);
400
 
  resource_context->setTransactionalStorageEngine(engine);
 
399
  resource_context.setMonitored(monitored);
 
400
  resource_context.setTransactionalStorageEngine(engine);
401
401
  trans->no_2pc|= true;
402
402
 
403
403
  if (session.transaction.xid_state.xid.is_null())
404
404
    session.transaction.xid_state.xid.set(session.getQueryId());
405
405
 
406
406
  /* Only true if user is executing a BEGIN WORK/START TRANSACTION */
407
 
  if (! session.getResourceContext(monitored, 0)->isStarted())
 
407
  if (not session.getResourceContext(*monitored, 0).isStarted())
408
408
    registerResourceForStatement(session, monitored, engine);
409
409
}
410
410
 
414
414
                                                         plugin::XaResourceManager *resource_manager)
415
415
{
416
416
  TransactionContext *trans= &session.transaction.all;
417
 
  ResourceContext *resource_context= session.getResourceContext(monitored, 1);
 
417
  ResourceContext& resource_context= session.getResourceContext(*monitored, 1);
418
418
 
419
 
  if (resource_context->isStarted())
 
419
  if (resource_context.isStarted())
420
420
    return; /* already registered, return */
421
421
 
422
422
  session.server_status|= SERVER_STATUS_IN_TRANS;
423
423
 
424
 
  trans->registerResource(resource_context);
 
424
  trans->registerResource(&resource_context);
425
425
 
426
426
  assert(monitored->participatesInSqlTransaction());
427
427
 
428
 
  resource_context->setMonitored(monitored);
429
 
  resource_context->setXaResourceManager(resource_manager);
430
 
  resource_context->setTransactionalStorageEngine(engine);
 
428
  resource_context.setMonitored(monitored);
 
429
  resource_context.setXaResourceManager(resource_manager);
 
430
  resource_context.setTransactionalStorageEngine(engine);
431
431
  trans->no_2pc|= true;
432
432
 
433
433
  if (session.transaction.xid_state.xid.is_null())
436
436
  engine->startTransaction(&session, START_TRANS_NO_OPTIONS);
437
437
 
438
438
  /* Only true if user is executing a BEGIN WORK/START TRANSACTION */
439
 
  if (! session.getResourceContext(monitored, 0)->isStarted())
 
439
  if (! session.getResourceContext(*monitored, 0).isStarted())
440
440
    registerResourceForStatement(session, monitored, engine, resource_manager);
441
441
}
442
442