← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_parse.cc

  • Committer: Mark Atwood
  • Date: 2011-06-24 11:45:17 UTC
  • mfrom: (2318.6.64 rf)
  • Revision ID: me@mark.atwood.name-20110624114517-1mq8no6jlp2nrg7m
merge lp:~olafvdspek/drizzle/refactor15

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_parse.cc
295
295
 
296
296
  /* If commit fails, we should be able to reset the OK status. */
297
297
  session->main_da().can_overwrite_status= true;
298
 
  TransactionServices &transaction_services= TransactionServices::singleton();
299
 
  transaction_services.autocommitOrRollback(*session, session->is_error());
 
298
  TransactionServices::autocommitOrRollback(*session, session->is_error());
300
299
  session->main_da().can_overwrite_status= false;
301
300
 
302
301
  session->transaction.stmt.reset();
1308
1307
    session_arg->lex().current_select= fake_select_lex;
1309
1308
  }
1310
1309
  session_arg->lex().pop_context();
1311
 
  return(0);
 
1310
  return 0;
1312
1311
}
1313
1312
 
1314
1313