Bug #91820: Fix static linking destruction order

silvakid · silvakid · commit 3218edace61a · 2018-08-16T10:52:29.000+01:00
diff --git 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<MySQL_Driver> > 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<MySQL_Driver> > driver;
+
   std::map< sql::SQLString, boost::shared_ptr< MySQL_Driver > >::const_iterator cit;
 
   if ((cit = driver.find(dummy)) != driver.end()) {

Original file line number	Diff line number	Diff line change
`@@ -70,8 +70,7 @@ namespace mysql`
`70`	`70`	`{`
`71`	`71`
`72`	`72`	`static const ::sql::SQLString emptyStr("");`
`73`		`-/* Mapping by client name is probably not enough here */`
`74`		`-static std::map< sql::SQLString, boost::shared_ptr<MySQL_Driver> > driver;`
	`73`	`+`
`75`	`74`
`76`	`75`	`CPPCONN_PUBLIC_FUNC sql::mysql::MySQL_Driver * get_driver_instance()`
`77`	`76`	`{`
`@@ -83,6 +82,9 @@ CPPCONN_PUBLIC_FUNC sql::mysql::MySQL_Driver * get_driver_instance_by_name(const`
`83`	`82`	`{`
`84`	`83`	`::sql::SQLString dummy(clientlib);`
`85`	`84`
	`85`	`+ /* Mapping by client name is probably not enough here */`
	`86`	`+ static std::map< sql::SQLString, boost::shared_ptr<MySQL_Driver> > driver;`
	`87`	`+`
`86`	`88`	`std::map< sql::SQLString, boost::shared_ptr< MySQL_Driver > >::const_iterator cit;`
`87`	`89`
`88`	`90`	`if ((cit = driver.find(dummy)) != driver.end()) {`