From 3218edace61af38bdd6c3029d1cd5a04c3bfd1f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Silva?= Date: Thu, 16 Aug 2018 10:52:29 +0100 Subject: [PATCH] Bug #91820: Fix static linking destruction order --- driver/mysql_driver.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/driver/mysql_driver.cpp b/driver/mysql_driver.cpp index 864d467..8d5199c 100644 --- a/driver/mysql_driver.cpp +++ b/driver/mysql_driver.cpp @@ -70,8 +70,7 @@ namespace mysql { static const ::sql::SQLString emptyStr(""); -/* Mapping by client name is probably not enough here */ -static std::map< sql::SQLString, boost::shared_ptr > driver; + CPPCONN_PUBLIC_FUNC sql::mysql::MySQL_Driver * get_driver_instance() { @@ -83,6 +82,9 @@ CPPCONN_PUBLIC_FUNC sql::mysql::MySQL_Driver * get_driver_instance_by_name(const { ::sql::SQLString dummy(clientlib); + /* Mapping by client name is probably not enough here */ + static std::map< sql::SQLString, boost::shared_ptr > driver; + std::map< sql::SQLString, boost::shared_ptr< MySQL_Driver > >::const_iterator cit; if ((cit = driver.find(dummy)) != driver.end()) { -- 2.7.4