#At file:///C:/Work/bzr/Merge/mysql-6.0-falcon-team/
2977 Kevin Lewis 2009-01-27
Bug#42365 - Delete redundant calls to
Database::getOpenConnection in StorageHandler::initialize()
and database->shutdown in Connection::shutdownDatabases().
modified:
storage/falcon/Connection.cpp
storage/falcon/StorageHandler.cpp
per-file messages:
storage/falcon/Connection.cpp
Bug#42365 - Delete redundant calls to
Database::getOpenConnection in StorageHandler::initialize()
and database->shutdown in Connection::shutdownDatabases().
storage/falcon/StorageHandler.cpp
Bug#42365 - Delete redundant calls to
Database::getOpenConnection in StorageHandler::initialize()
and database->shutdown in Connection::shutdownDatabases().
=== modified file 'storage/falcon/Connection.cpp'
--- a/storage/falcon/Connection.cpp 2008-07-24 08:45:03 +0000
+++ b/storage/falcon/Connection.cpp 2009-01-27 17:26:16 +0000
@@ -376,7 +376,6 @@ void Connection::shutdownDatabases()
{
unlink(database);
database->shutdown();
- database->shutdown();
database->release();
}
}
=== modified file 'storage/falcon/StorageHandler.cpp'
--- a/storage/falcon/StorageHandler.cpp 2008-12-10 13:25:17 +0000
+++ b/storage/falcon/StorageHandler.cpp 2009-01-27 17:26:16 +0000
@@ -984,7 +984,6 @@ void StorageHandler::initialize(void)
try
{
- defaultDatabase->getOpenConnection();
dictionaryConnection = defaultDatabase->getOpenConnection();
dropTempTables();
dictionaryConnection->commit();
