[patch] Allow successful compilation against connector 1.1.5

MySQLCppConn115.patch (text/plain), 1.83 KB, created by Martin von Gagern on 2015-03-01 01:46:30 UTC

Make MySQL Workbench compile against C++ connector 1.1.5.

I'm not sure whether 1.1.4 really ships a version-info.h,
but since Gentoo doesn't have 1.1.4 in portage,
re-using its feature test macro seems safe enough.

See: https://bugs.gentoo.org/show_bug.cgi?id=541736

2015-03-01 Martin von Gagern


Index: mysql-workbench-community-6.2.3-src/CMakeLists.txt
===================================================================
--- mysql-workbench-community-6.2.3-src.orig/CMakeLists.txt
+++ mysql-workbench-community-6.2.3-src/CMakeLists.txt
@@ -85,7 +85,7 @@ find_package(TinyXML REQUIRED)
 find_package(GDAL REQUIRED)
 
 if (MYSQLCPPCONN_VERSION_1_1_4)
-  add_definition(-DMYSQLCPPCONN_VERSION_1_1_4)
+  add_definitions(-DMYSQLCPPCONN_VERSION_1_1_4)
 endif ()
 
 if (UNIX)
Index: mysql-workbench-community-6.2.3-src/library/cdbc/src/driver_manager.cpp
===================================================================
--- mysql-workbench-community-6.2.3-src.orig/library/cdbc/src/driver_manager.cpp
+++ mysql-workbench-community-6.2.3-src/library/cdbc/src/driver_manager.cpp
@@ -20,6 +20,9 @@
 #include "driver_manager.h"
 
 #include "mysql_driver.h"
+#if defined(MYSQLCPPCONN_VERSION_1_1_4)
+#include "cppconn/version_info.h"
+#endif
 #include "cppconn/driver.h"
 #include "cppconn/statement.h"
 #include "cppconn/exception.h"
@@ -402,7 +405,11 @@ retry:
       ConnectOptionsMap::iterator prop_iter= properties.find(prop_name);
       if (properties.end() != prop_iter)
       {
+#if defined(MYCPPCONN_DM_PATCH_VERSION) && (MYCPPCONN_DM_MAJOR_VERSION > 1 || MYCPPCONN_DM_MINOR_VERSION > 1 || MYCPPCONN_DM_PATCH_VERSION >= 5)
+        sql::SQLString &val= *prop_iter->second.get<sql::SQLString>();
+#else
         sql::SQLString &val= boost::get<sql::SQLString>(prop_iter->second);
+#endif
         if (val->empty())
           properties.erase(prop_iter);
       }