← Back to branch summary

~brianaker/drizzle/bug730986

« back to all changes in this revision

Viewing changes to drizzled/session.cc

  • Committer: Mark Atwood
  • Date: 2011-07-07 02:23:07 UTC
  • mfrom: (2318.6.116 refactor18)
  • Revision ID: me@mark.atwood.name-20110707022307-4db00nqaaczzc3jv
merge lp:~olafvdspek/drizzle/refactor18

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.cc
25
25
 
26
26
#include <boost/checked_delete.hpp>
27
27
#include <boost/filesystem.hpp>
 
28
#include <boost/ptr_container/ptr_container.hpp>
28
29
#include <drizzled/copy_field.h>
29
30
#include <drizzled/data_home.h>
30
31
#include <drizzled/diagnostics_area.h>
184
185
  session::TableMessages table_message_cache;
185
186
  util::string::mptr schema;
186
187
  boost::shared_ptr<session::State> state;
187
 
  std::vector<table::Singular*> temporary_shares;
 
188
  boost::ptr_vector<table::Singular> temporary_shares;
188
189
        session::Times times;
189
190
        session::Transactions transaction;
190
191
  drizzle_system_variables variables;
854
855
  _where= Session::DEFAULT_WHERE;
855
856
 
856
857
  /* Reset the temporary shares we built */
857
 
  for_each(impl_->temporary_shares.begin(), impl_->temporary_shares.end(), DeletePtr());
858
858
  impl_->temporary_shares.clear();
859
859
}
860
860
 
1905
1905
table::Singular& Session::getInstanceTable()
1906
1906
{
1907
1907
  impl_->temporary_shares.push_back(new table::Singular); // This will not go into the tableshare cache, so no key is used.
1908
 
  return *impl_->temporary_shares.back();
 
1908
  return impl_->temporary_shares.back();
1909
1909
}
1910
1910
 
1911
1911
 
1930
1930
table::Singular& Session::getInstanceTable(std::list<CreateField>& field_list)
1931
1931
{
1932
1932
  impl_->temporary_shares.push_back(new table::Singular(this, field_list)); // This will not go into the tableshare cache, so no key is used.
1933
 
  return *impl_->temporary_shares.back();
 
1933
  return impl_->temporary_shares.back();
1934
1934
}
1935
1935
 
1936
1936
void Session::clear_error(bool full)
1939
1939
    main_da().reset_diagnostics_area();
1940
1940
 
1941
1941
  if (full)
1942
 
  {
1943
 
    drizzle_reset_errors(this, true);
1944
 
  }
 
1942
    drizzle_reset_errors(*this, true);
1945
1943
}
1946
1944
 
1947
1945
void Session::clearDiagnostics()