← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/plugin/storage_engine.cc

  • Committer: Monty Taylor
  • Date: 2011-04-06 21:23:45 UTC
  • mfrom: (2268.1.4 build)
  • Revision ID: mordred@inaugust.com-20110406212345-a7w7nkcuq60ybi4z
Merge Monty: Windows Fixes
Merge Olaf: open_table refactor

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/plugin/storage_engine.cc
336
336
{
337
337
  if (include_temporary_tables)
338
338
  {
339
 
    if (session.doDoesTableExist(identifier))
 
339
    if (session.open_tables.doDoesTableExist(identifier))
340
340
      return true;
341
341
  }
342
342
 
368
368
 
369
369
  if (include_temporary_tables)
370
370
  {
371
 
    Table *table= session.find_temporary_table(identifier);
 
371
    Table *table= session.open_tables.find_temporary_table(identifier);
372
372
    if (table)
373
373
    {
374
374
      return message::table::shared_ptr(new message::Table(*table->getShare()->getTableMessage()));
651
651
  std::for_each(vector_of_engines.begin(), vector_of_engines.end(),
652
652
                AddTableIdentifier(directory, schema_identifier, set_of_identifiers));
653
653
 
654
 
  session.doGetTableIdentifiers(directory, schema_identifier, set_of_identifiers);
 
654
  session.open_tables.doGetTableIdentifiers(directory, schema_identifier, set_of_identifiers);
655
655
}
656
656
 
657
657
class DropTable: public std::unary_function<identifier::Table&, bool>