← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_delete.cc

  • Committer: Brian Aker
  • Date: 2009-10-10 05:51:14 UTC
  • mfrom: (1124.2.16 bug-fixes)
  • Revision ID: brian@gaz-20091010055114-ko4mneekygcn50uo
Merge Diego

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_delete.cc
168
168
    free_underlaid_joins(session, select_lex);
169
169
    session->row_count_func= 0;
170
170
    DRIZZLE_DELETE_DONE(0, 0);
 
171
    /**
 
172
     * Resetting the Diagnostic area to prevent
 
173
     * lp bug# 439719
 
174
     */
 
175
    session->main_da.reset_diagnostics_area();
171
176
    session->my_ok((ha_rows) session->row_count_func);
172
177
    /*
173
178
      We don't need to call reset_auto_increment in this case, because
331
336
  if (error < 0 || (session->lex->ignore && !session->is_fatal_error))
332
337
  {
333
338
    session->row_count_func= deleted;
 
339
    /**
 
340
     * Resetting the Diagnostic area to prevent
 
341
     * lp bug# 439719
 
342
     */
 
343
    session->main_da.reset_diagnostics_area();    
334
344
    session->my_ok((ha_rows) session->row_count_func);
335
345
  }
336
346
  return (error >= 0 || session->is_error());