← 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: 2011-01-10 22:11:30 UTC
  • mto: (2077.1.1 drizzle)
  • mto: This revision was merged to the branch mainline in revision 2078.
  • Revision ID: brian@tangent.org-20110110221130-wqvw2wnb14is5kqc
Clear up naming convention for table type.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.cc
51
51
 
52
52
#include "drizzled/identifier.h"
53
53
 
54
 
#include "drizzled/table/instance.h"
 
54
#include "drizzled/table/singular.h"
55
55
 
56
56
#include "plugin/myisam/myisam.h"
57
57
#include "drizzled/internal/iocache.h"
2113
2113
  return true;
2114
2114
}
2115
2115
 
2116
 
table::Instance *Session::getInstanceTable()
 
2116
table::Singular *Session::getInstanceTable()
2117
2117
{
2118
 
  temporary_shares.push_back(new table::Instance()); // This will not go into the tableshare cache, so no key is used.
 
2118
  temporary_shares.push_back(new table::Singular()); // This will not go into the tableshare cache, so no key is used.
2119
2119
 
2120
 
  table::Instance *tmp_share= temporary_shares.back();
 
2120
  table::Singular *tmp_share= temporary_shares.back();
2121
2121
 
2122
2122
  assert(tmp_share);
2123
2123
 
2143
2143
  @return
2144
2144
    0 if out of memory, Table object in case of success
2145
2145
*/
2146
 
table::Instance *Session::getInstanceTable(List<CreateField> &field_list)
 
2146
table::Singular *Session::getInstanceTable(List<CreateField> &field_list)
2147
2147
{
2148
 
  temporary_shares.push_back(new table::Instance(this, field_list)); // This will not go into the tableshare cache, so no key is used.
 
2148
  temporary_shares.push_back(new table::Singular(this, field_list)); // This will not go into the tableshare cache, so no key is used.
2149
2149
 
2150
 
  table::Instance *tmp_share= temporary_shares.back();
 
2150
  table::Singular *tmp_share= temporary_shares.back();
2151
2151
 
2152
2152
  assert(tmp_share);
2153
2153