← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_table.cc

  • Committer: Olaf van der Spek
  • Date: 2011-03-22 09:36:03 UTC
  • mto: (2245.1.2 build)
  • mto: This revision was merged to the branch mainline in revision 2246.
  • Revision ID: olafvdspek@gmail.com-20110322093603-hs0dmf20kbd8ckmb
Move warn_list from Session to diagnostics_area

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_table.cc
44
44
#include <drizzled/pthread_globals.h>
45
45
#include <drizzled/typelib.h>
46
46
#include <drizzled/plugin/storage_engine.h>
 
47
#include <drizzled/diagnostics_area.h>
47
48
 
48
49
#include <algorithm>
49
50
#include <sstream>
1809
1810
    */
1810
1811
    if (!table->table)
1811
1812
    {
1812
 
      if (!session->warn_list.size())
 
1813
      if (!session->main_da().m_warn_list.size())
1813
1814
        push_warning(session, DRIZZLE_ERROR::WARN_LEVEL_ERROR,
1814
1815
                     ER_CHECK_NO_SUCH_TABLE, ER(ER_CHECK_NO_SUCH_TABLE));
1815
1816
      result_code= HA_ADMIN_CORRUPT;
1858
1859
    session->lex().cleanup_after_one_table_open();
1859
1860
    session->clear_error();  // these errors shouldn't get client
1860
1861
    {
1861
 
      List<DRIZZLE_ERROR>::iterator it(session->warn_list.begin());
 
1862
      List<DRIZZLE_ERROR>::iterator it(session->main_da().m_warn_list.begin());
1862
1863
      DRIZZLE_ERROR *err;
1863
1864
      while ((err= it++))
1864
1865
      {