Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 541736 | Differences between
and this patch

Collapse All | Expand All

(-)mysql-workbench-community-6.2.3-src/CMakeLists.txt (-1 / +1 lines)
Lines 85-91 find_package(TinyXML REQUIRED) Link Here
85 
find_package(GDAL REQUIRED)
 85 
find_package(GDAL REQUIRED)
86 

          86
          

        

        

          87
          
if (MYSQLCPPCONN_VERSION_1_1_4)

          87
          
if (MYSQLCPPCONN_VERSION_1_1_4)

        

          
            

              88
              
  add_definition(-DMYSQLCPPCONN_VERSION_1_1_4)


              88
              
  add_definitions(-DMYSQLCPPCONN_VERSION_1_1_4)

            

        

          89
          
endif ()

          89
          
endif ()

        

        

          90
          

          90
          

        

        

          91
          
if (UNIX)

          91
          
if (UNIX)

        



(-)mysql-workbench-community-6.2.3-src/library/cdbc/src/driver_manager.cpp
      (+7 lines)




  

    
      
            Lines 20-25
          
      
      
        Link Here
      
    
  

        

          20
          
#include "driver_manager.h"

          20
          
#include "driver_manager.h"

        

        

          21
          

          21
          

        

        

          22
          
#include "mysql_driver.h"

          22
          
#include "mysql_driver.h"

        

            

              
              
              23
              
#if defined(MYSQLCPPCONN_VERSION_1_1_4)

            

            

              24
              
#include "cppconn/version_info.h"

            

            

              25
              
#endif

            

        

          23
          
#include "cppconn/driver.h"

          26
          
#include "cppconn/driver.h"

        

        

          24
          
#include "cppconn/statement.h"

          27
          
#include "cppconn/statement.h"

        

        

          25
          
#include "cppconn/exception.h"

          28
          
#include "cppconn/exception.h"

        

  

    
      
            Lines 402-408
          retry:
      
      
        Link Here
      
    
  

        

          402
          
      ConnectOptionsMap::iterator prop_iter= properties.find(prop_name);

          405
          
      ConnectOptionsMap::iterator prop_iter= properties.find(prop_name);

        

        

          403
          
      if (properties.end() != prop_iter)

          406
          
      if (properties.end() != prop_iter)

        

        

          404
          
      {

          407
          
      {

        

            

              
              
              408
              
#if defined(MYCPPCONN_DM_PATCH_VERSION) && (MYCPPCONN_DM_MAJOR_VERSION > 1 || MYCPPCONN_DM_MINOR_VERSION > 1 || MYCPPCONN_DM_PATCH_VERSION >= 5)

            

            

              409
              
        sql::SQLString &val= *prop_iter->second.get<sql::SQLString>();

            

            

              410
              
#else

            

        

          405
          
        sql::SQLString &val= boost::get<sql::SQLString>(prop_iter->second);

          411
          
        sql::SQLString &val= boost::get<sql::SQLString>(prop_iter->second);

        

            

              
              
              412
              
#endif

            

        

          406
          
        if (val->empty())

          413
          
        if (val->empty())

        

        

          407
          
          properties.erase(prop_iter);

          414
          
          properties.erase(prop_iter);

        

        

          408
          
      }

          415
          
      }

        






  

  Return to bug 541736