← Back to branch summary

~posulliv/drizzle/optimizer-style-cleanup

« back to all changes in this revision

Viewing changes to drizzled/sql_update.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_update.cc
145
145
  List<Item> all_fields;
146
146
  Session::killed_state killed_status= Session::NOT_KILLED;
147
147
 
148
 
  DRIZZLE_UPDATE_START(session->query);
 
148
  DRIZZLE_UPDATE_START(session->query.c_str());
149
149
  if (session->openTablesLock(table_list))
150
150
  {
151
151
    DRIZZLE_UPDATE_DONE(1, 0, 0);
511
511
  table->cursor->try_semi_consistent_read(0);
512
512
 
513
513
  if (!transactional_table && updated > 0)
514
 
    session->transaction.stmt.modified_non_trans_table= true;
 
514
    session->transaction.stmt.markModifiedNonTransData();
515
515
 
516
516
  end_read_record(&info);
517
517
  delete select;
527
527
    Sometimes we want to binlog even if we updated no rows, in case user used
528
528
    it to be sure master and slave are in same state.
529
529
  */
530
 
  if ((error < 0) || session->transaction.stmt.modified_non_trans_table)
 
530
  if ((error < 0) || session->transaction.stmt.hasModifiedNonTransData())
531
531
  {
532
 
    if (session->transaction.stmt.modified_non_trans_table)
533
 
      session->transaction.all.modified_non_trans_table= true;
 
532
    if (session->transaction.stmt.hasModifiedNonTransData())
 
533
      session->transaction.all.markModifiedNonTransData();
534
534
  }
535
 
  assert(transactional_table || !updated || session->transaction.stmt.modified_non_trans_table);
 
535
  assert(transactional_table || !updated || session->transaction.stmt.hasModifiedNonTransData());
536
536
  free_underlaid_joins(session, select_lex);
537
537
 
538
538
  /* If LAST_INSERT_ID(X) was used, report X */