← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_update.cc

  • Committer: Lee Bieber
  • Date: 2011-03-16 18:11:33 UTC
  • mfrom: (2239.2.2 build)
  • Revision ID: kalebral@gmail.com-20110316181133-zr1uj612rz7s32s0
Merge Patrick - Added some randgen test cases
Merge Olaf - refactor includes

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_update.cc
35
35
#include <drizzled/plugin/storage_engine.h>
36
36
#include <drizzled/key.h>
37
37
#include <drizzled/sql_lex.h>
 
38
#include <drizzled/diagnostics_area.h>
 
39
#include <drizzled/util/test.h>
38
40
 
39
41
#include <boost/dynamic_bitset.hpp>
40
42
#include <list>
248
250
     * Resetting the Diagnostic area to prevent
249
251
     * lp bug# 439719
250
252
     */
251
 
    session->main_da.reset_diagnostics_area();
 
253
    session->main_da().reset_diagnostics_area();
252
254
    free_underlaid_joins(session, select_lex);
253
255
    if (error || session->is_error())
254
256
    {
577
579
     * Resetting the Diagnostic area to prevent
578
580
     * lp bug# 439719
579
581
     */
580
 
    session->main_da.reset_diagnostics_area();
 
582
    session->main_da().reset_diagnostics_area();
581
583
    session->my_ok((ulong) session->rowCount(), found, id, buff);
582
584
    session->status_var.updated_row_count+= session->rowCount();
583
585
  }