← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_delete.cc

  • Committer: Padraig O'Sullivan
  • Date: 2009-09-17 00:08:20 UTC
  • mto: (1126.9.3 captain-20090915-01)
  • mto: This revision was merged to the branch mainline in revision 1133.
  • Revision ID: osullivan.padraig@gmail.com-20090917000820-urd6p46qngi1okjp
Updated calls to some dtrace probes to cast the parameter to const char *
appropriately. Also, removed the additional variable in places that I was
using.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_delete.cc
51
51
  uint32_t usable_index= MAX_KEY;
52
52
  Select_Lex   *select_lex= &session->lex->select_lex;
53
53
  Session::killed_state killed_status= Session::NOT_KILLED;
54
 
  int res= 0;
55
 
 
56
54
 
57
55
  if (session->openTablesLock(table_list))
58
56
  {
327
325
  assert(transactional_table || !deleted || session->transaction.stmt.modified_non_trans_table);
328
326
  free_underlaid_joins(session, select_lex);
329
327
 
330
 
  res= (error >= 0 || session->is_error());
331
 
  DRIZZLE_DELETE_DONE(res, deleted);
 
328
  DRIZZLE_DELETE_DONE((error >= 0 || session->is_error()), deleted);
332
329
  if (error < 0 || (session->lex->ignore && !session->is_fatal_error))
333
330
  {
334
331
    session->row_count_func= deleted;