← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_update.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_update.cc
215
215
      (select && select->check_quick(session, safe_update, limit)))
216
216
  {
217
217
    delete select;
 
218
    /**
 
219
     * Resetting the Diagnostic area to prevent
 
220
     * lp bug# 439719
 
221
     */
 
222
    session->main_da.reset_diagnostics_area();
218
223
    free_underlaid_joins(session, select_lex);
219
224
    if (error)
220
225
      goto abort;                               // Error in where
632
637
    sprintf(buff, ER(ER_UPDATE_INFO), (ulong) found, (ulong) updated,
633
638
            (ulong) session->cuted_fields);
634
639
    session->row_count_func= updated;
 
640
    /**
 
641
     * Resetting the Diagnostic area to prevent
 
642
     * lp bug# 439719
 
643
     */
 
644
    session->main_da.reset_diagnostics_area();
635
645
    session->my_ok((ulong) session->row_count_func, found, id, buff);
636
646
  }
637
647
  session->count_cuted_fields= CHECK_FIELD_IGNORE;              /* calc cuted fields */