← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/start_transaction.cc

Merge in Stewart

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/start_transaction.cc
28
28
 
29
29
bool statement::StartTransaction::execute()
30
30
{
 
31
  if (getSession()->inTransaction())
 
32
  {
 
33
    push_warning_printf(getSession(), DRIZZLE_ERROR::WARN_LEVEL_WARN,
 
34
                        ER_TRANSACTION_ALREADY_STARTED,
 
35
                        ER(ER_TRANSACTION_ALREADY_STARTED));
 
36
    return false;
 
37
  }
 
38
 
31
39
  if (getSession()->transaction.xid_state.xa_state != XA_NOTR)
32
40
  {
33
41
    my_error(ER_XAER_RMFAIL, MYF(0),