← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.cc

  • Committer: Olaf van der Spek
  • Date: 2011-03-22 00:06:56 UTC
  • mto: (2245.1.1 build)
  • mto: This revision was merged to the branch mainline in revision 2246.
  • Revision ID: olafvdspek@gmail.com-20110322000656-32opecu17jlf2bd8
Refactor

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.cc
171
171
  impl_(new impl_c),
172
172
  mem_root(&main_mem_root),
173
173
  query(new std::string),
174
 
  _schema(new std::string),
175
174
  scheduler(NULL),
176
175
  scheduler_arg(NULL),
177
176
  variables(impl_->variables),
2086
2085
  }
2087
2086
}
2088
2087
 
2089
 
table::Singular *Session::getInstanceTable()
 
2088
table::Singular& Session::getInstanceTable()
2090
2089
{
2091
 
  temporary_shares.push_back(new table::Singular()); // This will not go into the tableshare cache, so no key is used.
2092
 
 
2093
 
  table::Singular *tmp_share= temporary_shares.back();
2094
 
 
2095
 
  assert(tmp_share);
2096
 
 
2097
 
  return tmp_share;
 
2090
  temporary_shares.push_back(new table::Singular); // This will not go into the tableshare cache, so no key is used.
 
2091
  return *temporary_shares.back();
2098
2092
}
2099
2093
 
2100
2094
 
2116
2110
  @return
2117
2111
    0 if out of memory, Table object in case of success
2118
2112
*/
2119
 
table::Singular *Session::getInstanceTable(List<CreateField> &field_list)
 
2113
table::Singular& Session::getInstanceTable(std::list<CreateField>& field_list)
2120
2114
{
2121
2115
  temporary_shares.push_back(new table::Singular(this, field_list)); // This will not go into the tableshare cache, so no key is used.
2122
 
  return temporary_shares.back();
 
2116
  return *temporary_shares.back();
2123
2117
}
2124
2118
 
2125
2119
void Session::clear_error(bool full)