← Back to branch summary

~posulliv/drizzle/optimizer-style-cleanup

« back to all changes in this revision

Viewing changes to drizzled/sql_delete.cc

  • Committer: Padraig O'Sullivan
  • Date: 2010-03-15 14:05:26 UTC
  • mfrom: (1237.9.99 staging)
  • Revision ID: osullivan.padraig@gmail.com-20100315140526-opbgwdwn6tfecdkq
Merge from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_delete.cc
299
299
  transactional_table= table->cursor->has_transactions();
300
300
 
301
301
  if (!transactional_table && deleted > 0)
302
 
    session->transaction.stmt.modified_non_trans_table= true;
 
302
    session->transaction.stmt.markModifiedNonTransData();
303
303
 
304
304
  /* See similar binlogging code in sql_update.cc, for comments */
305
 
  if ((error < 0) || session->transaction.stmt.modified_non_trans_table)
 
305
  if ((error < 0) || session->transaction.stmt.hasModifiedNonTransData())
306
306
  {
307
 
    if (session->transaction.stmt.modified_non_trans_table)
308
 
      session->transaction.all.modified_non_trans_table= true;
 
307
    if (session->transaction.stmt.hasModifiedNonTransData())
 
308
      session->transaction.all.markModifiedNonTransData();
309
309
  }
310
 
  assert(transactional_table || !deleted || session->transaction.stmt.modified_non_trans_table);
 
310
  assert(transactional_table || !deleted || session->transaction.stmt.hasModifiedNonTransData());
311
311
  free_underlaid_joins(session, select_lex);
312
312
 
313
313
  DRIZZLE_DELETE_DONE((error >= 0 || session->is_error()), deleted);