← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_update.cc

  • Committer: Jay Pipes
  • Date: 2009-09-21 14:33:44 UTC
  • mfrom: (1126.10.26 dtrace-probes)
  • mto: This revision was merged to the branch mainline in revision 1133.
  • Revision ID: jpipes@serialcoder-20090921143344-jnarp7gcn6zmg19c
Merge fixes from Trond and Padraig on dtrace probes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_update.cc
138
138
  uint64_t     id;
139
139
  List<Item> all_fields;
140
140
  Session::killed_state killed_status= Session::NOT_KILLED;
141
 
  int res= 0;
142
141
 
143
142
  DRIZZLE_UPDATE_START(session->query);
144
143
  if (session->openTablesLock(table_list))
641
640
  }
642
641
  session->count_cuted_fields= CHECK_FIELD_IGNORE;              /* calc cuted fields */
643
642
  session->abort_on_warning= 0;
644
 
  res= (error >= 0 || session->is_error()) ? 1 : 0;
645
 
  DRIZZLE_UPDATE_DONE(res, found, updated);
 
643
  DRIZZLE_UPDATE_DONE((error >= 0 || session->is_error()), found, updated);
646
644
  return ((error >= 0 || session->is_error()) ? 1 : 0);
647
645
 
648
646
err: