diff --git a/Data/MySQL/include/Poco/Data/MySQL/Connector.h b/Data/MySQL/include/Poco/Data/MySQL/Connector.h index c7f70b26b..35a20c20c 100644 --- a/Data/MySQL/include/Poco/Data/MySQL/Connector.h +++ b/Data/MySQL/include/Poco/Data/MySQL/Connector.h @@ -62,7 +62,7 @@ public: static void unregisterConnector(); /// Unregisters the Connector under the Keyword Connector::KEY at the Poco::Data::SessionFactory - static Poco::Mutex _mutex; + static Poco::FastMutex _mutex; }; diff --git a/Data/MySQL/src/Connector.cpp b/Data/MySQL/src/Connector.cpp index 3afac3073..3b7bf841e 100644 --- a/Data/MySQL/src/Connector.cpp +++ b/Data/MySQL/src/Connector.cpp @@ -30,7 +30,7 @@ namespace MySQL { std::string Connector::KEY(POCO_DATA_MYSQL_CONNECTOR_NAME); -Poco::Mutex Connector::_mutex; +Poco::FastMutex Connector::_mutex; Connector::Connector() @@ -53,7 +53,7 @@ Poco::AutoPtr Connector::createSession(const std::strin { static bool initDone = false; { - Poco::Mutex::ScopedLock l(_mutex); + Poco::FastMutex::ScopedLock l(_mutex); if (!initDone) { if (mysql_library_init(0, 0, 0) != 0) diff --git a/Data/MySQL/testsuite/run-tests.sh b/Data/MySQL/testsuite/run-tests.sh index 79be0fa81..93be91553 100755 --- a/Data/MySQL/testsuite/run-tests.sh +++ b/Data/MySQL/testsuite/run-tests.sh @@ -6,16 +6,16 @@ MYSQL_DOCKER_VER=latest # trying to conect prematurely will fail, 10s should be enough wait time MYSQL_DB_START_WAIT=10 -echo "running mysql docker container" -docker run -p 3306:3306 --name poco-test-mysql -e MYSQL_ROOT_PASSWORD=poco -e MYSQL_DATABASE=pocotestdb -d mysql:$MYSQL_DOCKER_VER +echo "running poco-test-mysql docker container" +docker run -p 3306:3306 --name poco-test-mysql -e MYSQL_ROOT_PASSWORD=poco -e MYSQL_DATABASE=pocotestdb -d mysql:$MYSQL_DOCKER_VER > /dev/null -echo "container up and running, sleeping $MYSQL_DB_START_WAIT seconds waiting for mysql db to start ..." +echo "poco-test-mysql container up and running, sleeping $MYSQL_DB_START_WAIT seconds waiting for db to start ..." sleep $MYSQL_DB_START_WAIT ./bin/Linux/x86_64/testrunner -all -echo "stopping mysql docker container" -docker stop poco-test-mysql +echo "stopping poco-test-mysql docker container" +docker stop poco-test-mysql > /dev/null -echo "removing mysql docker container" -docker rm poco-test-mysql +echo "removing poco-test-mysql docker container" +docker rm poco-test-mysql > /dev/null