← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.cc

  • Committer: Brian Aker
  • Date: 2010-10-14 18:32:09 UTC
  • mto: This revision was merged to the branch mainline in revision 1855.
  • Revision ID: brian@tangent.org-20101014183209-884iivwn1og2v3yd
Committing refactor of table out (this is part of the concurrency work).

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.cc
48
48
#include "drizzled/transaction_services.h"
49
49
#include "drizzled/drizzled.h"
50
50
 
51
 
#include "drizzled/table_share_instance.h"
 
51
#include "drizzled/table/instance.h"
52
52
 
53
53
#include "plugin/myisam/myisam.h"
54
54
#include "drizzled/internal/iocache.h"
55
55
#include "drizzled/internal/thread_var.h"
56
56
#include "drizzled/plugin/event_observer.h"
57
57
 
 
58
#include "drizzled/util/functors.h"
 
59
 
58
60
#include <fcntl.h>
59
61
#include <algorithm>
60
62
#include <climits>
826
828
  where= Session::DEFAULT_WHERE;
827
829
 
828
830
  /* Reset the temporary shares we built */
829
 
  for (std::vector<TableShareInstance *>::iterator iter= temporary_shares.begin();
830
 
       iter != temporary_shares.end(); iter++)
831
 
  {
832
 
    delete *iter;
833
 
  }
 
831
  for_each(temporary_shares.begin(),
 
832
           temporary_shares.end(),
 
833
           DeletePtr());
834
834
  temporary_shares.clear();
835
835
}
836
836
 
2051
2051
  return true;
2052
2052
}
2053
2053
 
2054
 
TableShareInstance *Session::getTemporaryShare(TableIdentifier::Type type_arg)
 
2054
table::Instance *Session::getTemporaryShare(TableIdentifier::Type type_arg)
2055
2055
{
2056
 
  temporary_shares.push_back(new TableShareInstance(type_arg)); // This will not go into the tableshare cache, so no key is used.
 
2056
  temporary_shares.push_back(new table::Instance(type_arg)); // This will not go into the tableshare cache, so no key is used.
2057
2057
 
2058
 
  TableShareInstance *tmp_share= temporary_shares.back();
 
2058
  table::Instance *tmp_share= temporary_shares.back();
2059
2059
 
2060
2060
  assert(tmp_share);
2061
2061