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