← Back to branch summary

~stewart/drizzle/seapitester-state-history

« back to all changes in this revision

Viewing changes to drizzled/session.cc

  • Committer: Lee Bieber
  • Date: 2011-01-12 04:30:24 UTC
  • mfrom: (2075.1.3 build)
  • Revision ID: kalebral@gmail.com-20110112043024-zgws6jzd54oym9um
Merge Brian - fix bug 527084 - DROP TABLE: getTableDefiniton returns EEXIST but doDropTable returns ENOENT leads to SIGSEGV
Merge Shrews - fix bug 686781 - Transaction message segmenting does not work in all cases 
Merge Stewart - fix bug 376299: sum_distinct-big test fails after resetting max_heap_table_size

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.cc
1975
1975
 
1976
1976
bool Open_tables_state::rm_temporary_table(const TableIdentifier &identifier, bool best_effort)
1977
1977
{
1978
 
  if (plugin::StorageEngine::dropTable(*static_cast<Session *>(this), identifier))
 
1978
  if (not plugin::StorageEngine::dropTable(*static_cast<Session *>(this), identifier))
1979
1979
  {
1980
1980
    if (not best_effort)
1981
1981
    {
1993
1993
 
1994
1994
bool Open_tables_state::rm_temporary_table(plugin::StorageEngine *base, const TableIdentifier &identifier)
1995
1995
{
 
1996
  drizzled::error_t error;
1996
1997
  assert(base);
1997
1998
 
1998
 
  if (plugin::StorageEngine::dropTable(*static_cast<Session *>(this), *base, identifier))
 
1999
  if (not plugin::StorageEngine::dropTable(*static_cast<Session *>(this), *base, identifier, error))
1999
2000
  {
2000
2001
    std::string path;
2001
2002
    identifier.getSQLPath(path);
2002
2003
    errmsg_printf(ERRMSG_LVL_WARN, _("Could not remove temporary table: '%s', error: %d"),
2003
 
                  path.c_str(), errno);
 
2004
                  path.c_str(), error);
2004
2005
 
2005
2006
    return true;
2006
2007
  }