← 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-03-04 08:33:14 UTC
  • mfrom: (1320.1.12 build)
  • Revision ID: brian@gaz-20100304083314-pscg89hdw618s2j5
Merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.cc
2040
2040
  return false;
2041
2041
}
2042
2042
 
2043
 
bool Session::rm_temporary_table(plugin::StorageEngine *base, TableIdentifier &identifier)
 
2043
bool Session::rm_temporary_table(TableIdentifier &identifier)
2044
2044
{
2045
 
  bool error= false;
2046
 
 
2047
 
  assert(base);
2048
 
 
2049
 
  if (plugin::StorageEngine::deleteDefinitionFromPath(identifier))
2050
 
    error= true;
2051
 
 
2052
 
  if (base->doDropTable(*this, identifier.getPath()))
 
2045
  if (not plugin::StorageEngine::dropTable(*this, identifier))
2053
2046
  {
2054
 
    error= true;
2055
2047
    errmsg_printf(ERRMSG_LVL_WARN, _("Could not remove temporary table: '%s', error: %d"),
2056
2048
                  identifier.getPath(), errno);
 
2049
 
 
2050
    return true;
2057
2051
  }
2058
 
  return error;
 
2052
 
 
2053
  return false;
2059
2054
}
2060
2055
 
2061
2056
bool Session::rm_temporary_table(plugin::StorageEngine *base, const char *path)