← 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: 2011-02-09 21:34:20 UTC
  • mfrom: (2148.5.17 alter-table)
  • mto: This revision was merged to the branch mainline in revision 2154.
  • Revision ID: brian@tangent.org-20110209213420-r7xcd8uulyvvtv2q
Merge parser tree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_delete.cc
181
181
     * lp bug# 439719
182
182
     */
183
183
    session->main_da.reset_diagnostics_area();
184
 
    session->my_ok((ha_rows) session->row_count_func);
 
184
    session->my_ok((ha_rows) session->rowCount());
185
185
    /*
186
186
      We don't need to call reset_auto_increment in this case, because
187
187
      mysql_truncate always gives a NULL conds argument, hence we never
347
347
     * lp bug# 439719
348
348
     */
349
349
    session->main_da.reset_diagnostics_area();    
350
 
    session->my_ok((ha_rows) session->row_count_func);
 
350
    session->my_ok((ha_rows) session->rowCount());
351
351
  }
352
352
  session->status_var.deleted_row_count+= deleted;
353
353