external/mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch

   1 --- misc/mysql-connector-c++-1.1.0/cppconn/build_config.h       2010-09-10 11:47:47.000000000 +0200
   2 +++ misc/build/mysql-connector-c++-1.1.0/cppconn/build_config.h 2011-11-12 00:45:19.000000000 +0100
   3 @@ -25,25 +25,21 @@
   4  #ifndef _SQL_BUILD_CONFIG_H_
   5  #define _SQL_BUILD_CONFIG_H_
   6
   7 -#ifndef CPPCONN_PUBLIC_FUNC
   8 +#include <sal/types.h>
   9
  10 -#if defined(_WIN32)
  11   // mysqlcppconn_EXPORTS is added by cmake and defined for dynamic lib build only
  12    #ifdef mysqlcppconn_EXPORTS
  13 -    #define CPPCONN_PUBLIC_FUNC __declspec(dllexport)
  14 +    #define CPPCONN_PUBLIC_FUNC SAL_DLLPUBLIC_EXPORT
  15    #else
  16      // this is for static build
  17      #ifdef CPPCONN_LIB_BUILD
  18        #define CPPCONN_PUBLIC_FUNC
  19      #else
  20        // this is for clients using dynamic lib
  21 -      #define CPPCONN_PUBLIC_FUNC __declspec(dllimport)
  22 +      #define CPPCONN_PUBLIC_FUNC SAL_DLLPUBLIC_IMPORT
  23      #endif
  24    #endif
  25 -#else
  26 -  #define CPPCONN_PUBLIC_FUNC
  27 -#endif
  28
  29 -#endif    //#ifndef CPPCONN_PUBLIC_FUNC
  30 +  #define CPPCONN_PUBLIC_EXCEPTION SAL_EXCEPTION_DLLPUBLIC_EXPORT
  31
  32  #endif    //#ifndef _SQL_BUILD_CONFIG_H_
  33 --- misc/mysql-connector-c++-1.1.0/cppconn/exception.h  2009-08-20 17:51:23.000000000 +0200
  34 +++ misc/build/mysql-connector-c++-1.1.0/cppconn/exception.h    2009-09-11 09:41:41.076379817 +0200
  35 @@ -37,7 +37,7 @@
  36  #pragma warning(push)
  37  #pragma warning(disable: 4275)
  38  #endif
  39 -class CPPCONN_PUBLIC_FUNC SQLException : public std::runtime_error
  40 +class CPPCONN_PUBLIC_EXCEPTION SQLException : public std::runtime_error
  41  {
  42  #ifdef _WIN32
  43  #pragma warning(pop)
  44 @@ -83,26 +83,26 @@
  45         MEMORY_ALLOC_OPERATORS(SQLException)
  46  };
  47
  48 -struct CPPCONN_PUBLIC_FUNC MethodNotImplementedException : public SQLException
  49 +struct CPPCONN_PUBLIC_EXCEPTION MethodNotImplementedException : public SQLException
  50  {
  51         MethodNotImplementedException(const MethodNotImplementedException& e) : SQLException(e.what(), e.sql_state, e.errNo) { }
  52         MethodNotImplementedException(const std::string& reason) : SQLException(reason, "", 0) {}
  53  };
  54
  55 -struct CPPCONN_PUBLIC_FUNC InvalidArgumentException : public SQLException
  56 +struct CPPCONN_PUBLIC_EXCEPTION InvalidArgumentException : public SQLException
  57  {
  58         InvalidArgumentException(const InvalidArgumentException& e) : SQLException(e.what(), e.sql_state, e.errNo) { }
  59         InvalidArgumentException(const std::string& reason) : SQLException(reason, "", 0) {}
  60  };
  61
  62 -struct CPPCONN_PUBLIC_FUNC InvalidInstanceException : public SQLException
  63 +struct CPPCONN_PUBLIC_EXCEPTION InvalidInstanceException : public SQLException
  64  {
  65         InvalidInstanceException(const InvalidInstanceException& e) : SQLException(e.what(), e.sql_state, e.errNo) { }
  66         InvalidInstanceException(const std::string& reason) : SQLException(reason, "", 0) {}
  67  };
  68
  69
  70 -struct CPPCONN_PUBLIC_FUNC NonScrollableException : public SQLException
  71 +struct CPPCONN_PUBLIC_EXCEPTION NonScrollableException : public SQLException
  72  {
  73         NonScrollableException(const NonScrollableException& e) : SQLException(e.what(), e.sql_state, e.errNo) { }
  74         NonScrollableException(const std::string& reason) : SQLException(reason, "", 0) {}
  75 --- misc/mysql-connector-c++-1.1.0/driver/mysql_debug.h 2009-08-13 17:13:46.000000000 +0200
  76 +++ misc/build/mysql-connector-c++-1.1.0/driver/mysql_debug.h   2009-08-14 09:56:37.015625000 +0200
  77 @@ -25,16 +25,6 @@
  78
  79
  80
  81 -#if defined(WE_HAVE_VARARGS_MACRO_SUPPORT) && (CPPCONN_TRACE_ENABLED || defined(SAL_DLLPRIVATE))
  82 -       #define CPP_ENTER(msg)                  const boost::shared_ptr< MySQL_DebugLogger > __l = this->logger;(void)__l;\
  83 -                                                                       MySQL_DebugEnterEvent __this_func(__LINE__, __FILE__, msg, this->logger)
  84 -       #define CPP_ENTER_WL(l, msg)    const boost::shared_ptr< MySQL_DebugLogger > __l = (l);(void)__l;\
  85 -                                                                       MySQL_DebugEnterEvent __this_func(__LINE__, __FILE__, msg, (l))
  86 -       #define CPP_INFO(msg)           {if (__l) __l->log("INF", msg); }
  87 -       #define CPP_INFO_FMT(...)       {if (__l) __l->log_va("INF", __VA_ARGS__); }
  88 -       #define CPP_ERR(msg)            {if (__l) __l->log("ERR", msg); }
  89 -       #define CPP_ERR_FMT(...)        {if (__l) __l->log_va("ERR", __VA_ARGS__); }
  90 -#else
  91         #define CPP_ENTER(msg)
  92         #define CPP_ENTER_WL(l, msg)
  93         #define CPP_INFO(msg)
  94 @@ -42,7 +32,6 @@
  95         #define CPP_ENTER_WL(l, msg)
  96         static inline void CPP_INFO_FMT(...) {}
  97         static inline void CPP_ERR_FMT(...) {}
  98 -#endif
  99
 100  #include <stack>
 101  #include "mysql_util.h"
 102 --- misc/mysql-connector-c++-1.1.0/driver/mysql_prepared_statement.cpp  2013-03-06 10:29:26.890721534 +0100
 103 +++ misc/build/mysql-connector-c++-1.1.0/driver/mysql_prepared_statement.cpp    2013-03-06 10:32:02.979904080 +0100
 104 @@ -46,6 +46,10 @@
 105
 106  #include "mysql_debug.h"
 107
 108 +#ifndef CR_INVALID_BUFFER_USE
 109 +#define CR_INVALID_BUFFER_USE  2035
 110 +#endif
 111 +
 112
 113  namespace sql
 114  {
 115