generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-28 19:51:58 +01:00
Code Issues Projects Releases Wiki Activity

removed automatic registration as it can cause a deadlock in mysql_library_init

Browse Source
This commit is contained in:
Guenter Obiltschnig
2016-03-01 11:48:14 +01:00
parent 8a13c50e63
commit ce4341e96b
2 changed files with 5 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Data/MySQL/src/Connector.cpp
View File

@@ -21,15 +21,12 @@
#include <mysql.h>
const MySQLConnectorRegistrator pocoMySQLConnectorRegistrator;
namespace Poco {
namespace Data {
namespace MySQL {
std::string Connector::KEY(POCO_DATA_MYSQL_CONNECTOR_NAME);
std::string Connector::KEY("mysql");
Connector::Connector()
@@ -41,12 +38,13 @@ Connector::~Connector()
{
}
const std::string& Connector::name() const
{
static const std::string n(POCO_DATA_MYSQL_CONNECTOR_NAME);
return n;
return KEY;
}
Poco::AutoPtr<Poco::Data::SessionImpl> Connector::createSession(const std::string& connectionString,
std::size_t timeout)
{
@@ -67,7 +65,7 @@ void Connector::registerConnector()
void Connector::unregisterConnector()
{
Poco::Data::SessionFactory::instance().remove(POCO_DATA_MYSQL_CONNECTOR_NAME);
Poco::Data::SessionFactory::instance().remove(KEY);
mysql_library_end();
}