/[packages]/updates/8/mysql-connector-c++/current/SOURCES/mysql-connector-cpp-mariadb.patch
ViewVC logotype

Diff of /updates/8/mysql-connector-c++/current/SOURCES/mysql-connector-cpp-mariadb.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1769472 by neoclust, Sat Jan 22 22:36:20 2022 UTC revision 1935261 by daviddavid, Mon Jan 23 18:41:04 2023 UTC
# Line 1  Line 1 
1  diff -uNr mysql-connector-c++-8.0.15-org/jdbc/cppconn/version_info.h.cmake mysql-connector-c++-8.0.15-src/jdbc/cppconn/version_info.h.cmake  diff -Nrup a/jdbc/cppconn/version_info.h.cmake b/jdbc/cppconn/version_info.h.cmake
2  --- mysql-connector-c++-8.0.15-org/jdbc/cppconn/version_info.h.cmake    2018-10-11 17:09:50.000000000 +0300  --- a/jdbc/cppconn/version_info.h.cmake 2022-12-09 08:00:36.000000000 +0100
3  +++ mysql-connector-c++-8.0.15-src/jdbc/cppconn/version_info.h.cmake    2019-02-16 12:24:40.553400318 +0200  +++ b/jdbc/cppconn/version_info.h.cmake 2023-01-22 18:53:00.456883178 +0100
4  @@ -42,5 +42,6 @@  @@ -48,5 +48,6 @@
5    
6   #define MYCPPCONN_STATIC_MYSQL_VERSION     "@MYSQL_VERSION@"   #define MYCPPCONN_STATIC_MYSQL_VERSION     "@MYSQL_VERSION@"
7   #define MYCPPCONN_STATIC_MYSQL_VERSION_ID  @MYSQL_NUM_VERSION@   #define MYCPPCONN_STATIC_MYSQL_VERSION_ID  @MYSQL_NUM_VERSION@
8  +#define MYCPPCONN_MARIADB_BUILD  +#define MYCPPCONN_MARIADB_BUILD
9    
10   #define MYCPPCONN_BOOST_VERSION            @Boost_VERSION@   #define MYCPPCONN_BOOST_VERSION            @Boost_VERSION@
11  diff -uNr mysql-connector-c++-8.0.15-org/jdbc/driver/mysql_connection.cpp mysql-connector-c++-8.0.15-src/jdbc/driver/mysql_connection.cpp  diff -Nrup a/jdbc/driver/mysql_connection.cpp b/jdbc/driver/mysql_connection.cpp
12  --- mysql-connector-c++-8.0.15-org/jdbc/driver/mysql_connection.cpp     2018-10-11 17:09:50.000000000 +0300  --- a/jdbc/driver/mysql_connection.cpp  2022-12-09 08:00:36.000000000 +0100
13  +++ mysql-connector-c++-8.0.15-src/jdbc/driver/mysql_connection.cpp     2019-02-16 12:27:46.395921145 +0200  +++ b/jdbc/driver/mysql_connection.cpp  2023-01-22 20:21:02.714025656 +0100
14  @@ -254,7 +254,7 @@  @@ -268,7 +268,7 @@ static const String2IntMap booleanOption
15       {OPT_CAN_HANDLE_EXPIRED_PASSWORDS, MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS, true},       {OPT_CAN_HANDLE_EXPIRED_PASSWORDS, MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS, true},
16       {OPT_CONNECT_ATTR_RESET,      MYSQL_OPT_CONNECT_ATTR_RESET, true},       {OPT_CONNECT_ATTR_RESET,      MYSQL_OPT_CONNECT_ATTR_RESET, true},
17       {OPT_RECONNECT,               MYSQL_OPT_RECONNECT, true},       {OPT_RECONNECT,               MYSQL_OPT_RECONNECT, true},
# Line 20  diff -uNr mysql-connector-c++-8.0.15-org Line 20  diff -uNr mysql-connector-c++-8.0.15-org
20       {"sslVerify",                   MYSQL_OPT_SSL_VERIFY_SERVER_CERT, false}, // Deprecated       {"sslVerify",                   MYSQL_OPT_SSL_VERIFY_SERVER_CERT, false}, // Deprecated
21       {"sslEnforce",                  MYSQL_OPT_SSL_ENFORCE, false} // Deprecated       {"sslEnforce",                  MYSQL_OPT_SSL_ENFORCE, false} // Deprecated
22   #else   #else
23  @@ -276,8 +276,8 @@  @@ -290,9 +290,9 @@ static const String2IntMap intOptions[]=
24       {OPT_MAX_ALLOWED_PACKET,  MYSQL_OPT_MAX_ALLOWED_PACKET, false},       {OPT_MAX_ALLOWED_PACKET,  MYSQL_OPT_MAX_ALLOWED_PACKET, false},
25       {OPT_NET_BUFFER_LENGTH,   MYSQL_OPT_NET_BUFFER_LENGTH, false},       {OPT_NET_BUFFER_LENGTH,   MYSQL_OPT_NET_BUFFER_LENGTH, false},
26   #endif   #endif
27  -    {OPT_SSL_MODE,            MYSQL_OPT_SSL_MODE    , false},  -    {OPT_SSL_MODE,            MYSQL_OPT_SSL_MODE    , false},
28    -    {"OPT_SSL_MODE",          MYSQL_OPT_SSL_MODE    , false},
29  -#if MYCPPCONN_STATIC_MYSQL_VERSION_ID >= 80000  -#if MYCPPCONN_STATIC_MYSQL_VERSION_ID >= 80000
30  +    //{OPT_SSL_MODE,            MYSQL_OPT_SSL_MODE    , false},  +    //{OPT_SSL_MODE,            MYSQL_OPT_SSL_MODE    , false},
31    +    //{"OPT_SSL_MODE",          MYSQL_OPT_SSL_MODE    , false},
32  +#if MYCPPCONN_STATIC_MYSQL_VERSION_ID >= 80000 && !defined(MYCPPCONN_MARIADB_BUILD)  +#if MYCPPCONN_STATIC_MYSQL_VERSION_ID >= 80000 && !defined(MYCPPCONN_MARIADB_BUILD)
33       {OPT_RETRY_COUNT,         MYSQL_OPT_RETRY_COUNT, false},       {OPT_RETRY_COUNT,         MYSQL_OPT_RETRY_COUNT, false},
34   #endif   #endif
35     };     };
36  @@ -303,7 +303,7 @@  @@ -321,7 +321,7 @@ static const String2IntMap stringOptions
  #if MYCPPCONN_STATIC_MYSQL_VERSION_ID >= 50700  
37       {OPT_TLS_VERSION,          MYSQL_OPT_TLS_VERSION, true},       {OPT_TLS_VERSION,          MYSQL_OPT_TLS_VERSION, true},
38         {"OPT_TLS_VERSION",        MYSQL_OPT_TLS_VERSION, true},
39   #endif   #endif
40  -    {OPT_LOAD_DATA_LOCAL_DIR, MYSQL_OPT_LOAD_DATA_LOCAL_DIR, false}  -    {OPT_LOAD_DATA_LOCAL_DIR, MYSQL_OPT_LOAD_DATA_LOCAL_DIR, false}
41  +    //{OPT_LOAD_DATA_LOCAL_DIR, MYSQL_OPT_LOAD_DATA_LOCAL_DIR, false}  +    //{OPT_LOAD_DATA_LOCAL_DIR, MYSQL_OPT_LOAD_DATA_LOCAL_DIR, false}
42     };     };
43    
44    
45  @@ -311,7 +311,7 @@  @@ -330,7 +330,7 @@ static const String2IntMap stringOptions
46   inline   inline
47   ::sql::mysql::MySQL_Connection_Options option_conversion(unsigned long client_version, int option)   ::sql::mysql::MySQL_Connection_Options option_conversion(unsigned long client_version, int option)
48   {   {
# Line 49  diff -uNr mysql-connector-c++-8.0.15-org Line 51  diff -uNr mysql-connector-c++-8.0.15-org
51     if(client_version <80011)     if(client_version <80011)
52     {     {
53       switch (option) {       switch (option) {
54  @@ -593,7 +593,7 @@  @@ -520,7 +520,7 @@ void MySQL_Connection::init(ConnectOptio
55     int  client_exp_pwd = false;     int  client_exp_pwd = false;
56     bool opt_dns_srv = false;     bool opt_dns_srv = false;
57     bool opt_multi_host = false;     bool opt_multi_host = false;
# Line 58  diff -uNr mysql-connector-c++-8.0.15-org Line 60  diff -uNr mysql-connector-c++-8.0.15-org
60     bool secure_auth= true;     bool secure_auth= true;
61   #endif   #endif
62    
63  @@ -602,7 +602,7 @@  @@ -636,7 +636,7 @@ void MySQL_Connection::init(ConnectOptio
64         } else {         } else {
65           throw sql::InvalidArgumentException("No string value passed for password");           throw sql::InvalidArgumentException("No string value passed for password");
66         }         }
# Line 67  diff -uNr mysql-connector-c++-8.0.15-org Line 69  diff -uNr mysql-connector-c++-8.0.15-org
69         try {         try {
70           p_s = (it->second).get< sql::SQLString >();           p_s = (it->second).get< sql::SQLString >();
71         } catch (sql::InvalidArgumentException&) {         } catch (sql::InvalidArgumentException&) {
72  @@ -638,7 +638,7 @@  @@ -672,7 +672,7 @@ void MySQL_Connection::init(ConnectOptio
73         } else {         } else {
74           throw sql::InvalidArgumentException("No string value passed for password3");           throw sql::InvalidArgumentException("No string value passed for password3");
75         }         }
# Line 76  diff -uNr mysql-connector-c++-8.0.15-org Line 78  diff -uNr mysql-connector-c++-8.0.15-org
78         try {         try {
79           p_i = (it->second).get< int >();           p_i = (it->second).get< int >();
80         } catch (sql::InvalidArgumentException&) {         } catch (sql::InvalidArgumentException&) {
81  @@ -902,7 +902,7 @@  @@ -936,7 +936,7 @@ void MySQL_Connection::init(ConnectOptio
82         } catch (sql::InvalidArgumentException&) {         } catch (sql::InvalidArgumentException&) {
83           throw sql::InvalidArgumentException("Wrong type passed for useLegacyAuth expected sql::SQLString");           throw sql::InvalidArgumentException("Wrong type passed for useLegacyAuth expected sql::SQLString");
84         }         }
# Line 85  diff -uNr mysql-connector-c++-8.0.15-org Line 87  diff -uNr mysql-connector-c++-8.0.15-org
87         if (p_b) {         if (p_b) {
88           secure_auth= !*p_b;           secure_auth= !*p_b;
89         } else {         } else {
90  @@ -944,7 +944,7 @@  @@ -978,7 +978,7 @@ void MySQL_Connection::init(ConnectOptio
91       } else if (!it->first.compare(OPT_CONNECT_ATTR_RESET)) {       } else if (!it->first.compare(OPT_CONNECT_ATTR_RESET)) {
92         proxy->options(MYSQL_OPT_CONNECT_ATTR_RESET, 0);         proxy->options(MYSQL_OPT_CONNECT_ATTR_RESET, 0);
93    
# Line 94  diff -uNr mysql-connector-c++-8.0.15-org Line 96  diff -uNr mysql-connector-c++-8.0.15-org
96    
97       //Deprecated       //Deprecated
98       } else if (!it->first.compare("sslVerify")) {       } else if (!it->first.compare("sslVerify")) {
99  @@ -961,6 +961,7 @@  @@ -1001,6 +1001,7 @@ void MySQL_Connection::init(ConnectOptio
100           throw sql::InvalidArgumentException("Wrong type passed for OPT_OCI_CONFIG_FILE. Expected sql::SQLString.");           throw sql::InvalidArgumentException("Wrong type passed for OPT_OCI_CONFIG_FILE. Expected sql::SQLString.");
101         }         }
102    
# Line 102  diff -uNr mysql-connector-c++-8.0.15-org Line 104  diff -uNr mysql-connector-c++-8.0.15-org
104         try {         try {
105           proxy->plugin_option(MYSQL_CLIENT_AUTHENTICATION_PLUGIN,           proxy->plugin_option(MYSQL_CLIENT_AUTHENTICATION_PLUGIN,
106                                   "authentication_oci_client",                                   "authentication_oci_client",
107  @@ -972,6 +972,7 @@  @@ -1012,6 +1013,7 @@ void MySQL_Connection::init(ConnectOptio
108             OPT_OCI_CONFIG_FILE             OPT_OCI_CONFIG_FILE
109           );           );
110         }         }
111  +      */  +      */
112    
113       }       } else if (!it->first.compare(OPT_AUTHENTICATION_KERBEROS_CLIENT_MODE)) {
114       else if (!it->first.compare(OPT_PLUGIN_DIR)) {   #if defined(_WIN32)
115  @@ -1000,7 +1000,7 @@  @@ -1080,7 +1082,7 @@ void MySQL_Connection::init(ConnectOptio
116    
117     }     }
118    
# Line 119  diff -uNr mysql-connector-c++-8.0.15-org Line 121  diff -uNr mysql-connector-c++-8.0.15-org
121     try {     try {
122       proxy->options(MYSQL_SECURE_AUTH, &secure_auth);       proxy->options(MYSQL_SECURE_AUTH, &secure_auth);
123     } catch (sql::InvalidArgumentException& e) {     } catch (sql::InvalidArgumentException& e) {
124  @@ -1772,7 +1772,7 @@  @@ -1232,6 +1234,7 @@ void MySQL_Connection::init(ConnectOptio
125           if (proxy && callback && *callback)
126           {
127             callback_mutex.lock();
128    +        /*
129             try
130             {
131               fido_callback_instance = callback;
132    @@ -1248,6 +1251,7 @@ void MySQL_Connection::init(ConnectOptio
133                 OPT_OCI_CONFIG_FILE
134               );
135             }
136    +        */
137           }
138         }
139    
140    @@ -1255,6 +1259,7 @@ void MySQL_Connection::init(ConnectOptio
141         {
142           if(fido_callback_instance && proxy)
143           {
144    +        /*
145             try
146             {
147               proxy->plugin_option(MYSQL_CLIENT_AUTHENTICATION_PLUGIN,
148    @@ -1262,7 +1267,7 @@ void MySQL_Connection::init(ConnectOptio
149                 "fido_messages_callback",
150                 nullptr);
151             }
152    -        catch(...) {}
153    +        catch(...) {} */
154             fido_callback_instance = nullptr;
155             callback_mutex.unlock();
156           }
157    @@ -1846,7 +1851,7 @@ MySQL_Connection::setClientOption(const
158   #endif   #endif
159     } else if (!optionName.compare(OPT_LOAD_DATA_LOCAL_DIR))     } else if (!optionName.compare(OPT_LOAD_DATA_LOCAL_DIR))
160     {     {
# Line 128  diff -uNr mysql-connector-c++-8.0.15-org Line 163  diff -uNr mysql-connector-c++-8.0.15-org
163     }     }
164     return this;     return this;
165   }   }
166  diff -uNr mysql-connector-c++-8.0.15-org/jdbc/driver/mysql_connection_options.h mysql-connector-c++-8.0.15-src/jdbc/driver/mysql_connection_options.h  diff -Nrup a/jdbc/driver/mysql_connection_options.h b/jdbc/driver/mysql_connection_options.h
167  --- mysql-connector-c++-8.0.15-org/jdbc/driver/mysql_connection_options.h       2018-10-11 17:09:50.000000000 +0300  --- a/jdbc/driver/mysql_connection_options.h    2022-12-09 08:00:36.000000000 +0100
168  +++ mysql-connector-c++-8.0.15-src/jdbc/driver/mysql_connection_options.h       2019-02-16 12:26:42.476429900 +0200  +++ b/jdbc/driver/mysql_connection_options.h    2023-01-22 19:05:18.089996917 +0100
169  @@ -41,7 +41,7 @@  @@ -41,7 +41,7 @@ namespace mysql
170    
171   enum MySQL_Connection_Options   enum MySQL_Connection_Options
172   {   {
# Line 140  diff -uNr mysql-connector-c++-8.0.15-org Line 175  diff -uNr mysql-connector-c++-8.0.15-org
175     MYSQL_OPT_CONNECT_TIMEOUT, MYSQL_OPT_COMPRESS, MYSQL_OPT_NAMED_PIPE,     MYSQL_OPT_CONNECT_TIMEOUT, MYSQL_OPT_COMPRESS, MYSQL_OPT_NAMED_PIPE,
176     MYSQL_INIT_COMMAND, MYSQL_READ_DEFAULT_FILE, MYSQL_READ_DEFAULT_GROUP,     MYSQL_INIT_COMMAND, MYSQL_READ_DEFAULT_FILE, MYSQL_READ_DEFAULT_GROUP,
177     MYSQL_SET_CHARSET_DIR, MYSQL_SET_CHARSET_NAME, MYSQL_OPT_LOCAL_INFILE,     MYSQL_SET_CHARSET_DIR, MYSQL_SET_CHARSET_NAME, MYSQL_OPT_LOCAL_INFILE,
178  @@ -86,8 +86,8 @@  @@ -92,8 +92,8 @@ enum MySQL_Connection_Options
179     MYSQL_OPT_SSL_ENFORCE,     MYSQL_OPT_SSL_ENFORCE,
180   #if MYCPPCONN_STATIC_MYSQL_VERSION_ID >= 50700   #if MYCPPCONN_STATIC_MYSQL_VERSION_ID >= 50700
181     MYSQL_OPT_MAX_ALLOWED_PACKET, MYSQL_OPT_NET_BUFFER_LENGTH,     MYSQL_OPT_MAX_ALLOWED_PACKET, MYSQL_OPT_NET_BUFFER_LENGTH,
# Line 151  diff -uNr mysql-connector-c++-8.0.15-org Line 186  diff -uNr mysql-connector-c++-8.0.15-org
186   #endif //MYCPPCONN_STATIC_MYSQL_VERSION_ID >= 50700   #endif //MYCPPCONN_STATIC_MYSQL_VERSION_ID >= 50700
187   #endif //MYCPPCONN_STATIC_MYSQL_VERSION_ID >= 80000   #endif //MYCPPCONN_STATIC_MYSQL_VERSION_ID >= 80000
188    
189  diff -uNr mysql-connector-c++-8.0.15-org/jdbc/driver/mysql_resultset_metadata.h mysql-connector-c++-8.0.15-src/jdbc/driver/mysql_resultset_metadata.h  diff -Nrup a/jdbc/driver/mysql_resultset_metadata.h b/jdbc/driver/mysql_resultset_metadata.h
190  --- mysql-connector-c++-8.0.15-org/jdbc/driver/mysql_resultset_metadata.h       2018-10-11 17:09:50.000000000 +0300  --- a/jdbc/driver/mysql_resultset_metadata.h    2022-12-09 08:00:36.000000000 +0100
191  +++ mysql-connector-c++-8.0.15-src/jdbc/driver/mysql_resultset_metadata.h       2019-02-16 12:26:42.476429900 +0200  +++ b/jdbc/driver/mysql_resultset_metadata.h    2023-01-22 19:07:09.748939037 +0100
192  @@ -38,7 +38,7 @@  @@ -38,7 +38,7 @@
193   #include <cppconn/resultset_metadata.h>   #include <cppconn/resultset_metadata.h>
194   #include <cppconn/version_info.h>   #include <cppconn/version_info.h>
# Line 163  diff -uNr mysql-connector-c++-8.0.15-org Line 198  diff -uNr mysql-connector-c++-8.0.15-org
198   struct MYSQL_FIELD;   struct MYSQL_FIELD;
199   #else   #else
200   struct st_mysql_field;   struct st_mysql_field;
201  diff -uNr mysql-connector-c++-8.0.15-org/jdbc/driver/nativeapi/libmysql_static_proxy.cpp mysql-connector-c++-8.0.15-src/jdbc/driver/nativeapi/libmysql_static_proxy.cpp  diff -Nrup a/jdbc/driver/nativeapi/libmysql_static_proxy.cpp b/jdbc/driver/nativeapi/libmysql_static_proxy.cpp
202  --- mysql-connector-c++-8.0.15-org/jdbc/driver/nativeapi/libmysql_static_proxy.cpp      2018-10-11 17:09:50.000000000 +0300  --- a/jdbc/driver/nativeapi/libmysql_static_proxy.cpp   2022-12-09 08:00:36.000000000 +0100
203  +++ mysql-connector-c++-8.0.15-src/jdbc/driver/nativeapi/libmysql_static_proxy.cpp      2019-02-16 12:26:42.476429900 +0200  +++ b/jdbc/driver/nativeapi/libmysql_static_proxy.cpp   2023-01-22 19:08:10.098446558 +0100
204  @@ -326,7 +326,7 @@  @@ -326,7 +326,7 @@ int
205   LibmysqlStaticProxy::get_option(MYSQL * mysql, enum mysql_option option, const void *arg)   LibmysqlStaticProxy::get_option(MYSQL * mysql, enum mysql_option option, const void *arg)
206   {   {
207   #if MYSQL_VERSION_ID >= 50703   #if MYSQL_VERSION_ID >= 50703
# Line 175  diff -uNr mysql-connector-c++-8.0.15-org Line 210  diff -uNr mysql-connector-c++-8.0.15-org
210       throw sql::InvalidArgumentException("Unsupported option provided to mysql_get_option()");       throw sql::InvalidArgumentException("Unsupported option provided to mysql_get_option()");
211     } else {     } else {
212       return 0;       return 0;
213  diff -uNr mysql-connector-c++-8.0.15-org/jdbc/driver/nativeapi/mysql_native_connection_wrapper.cpp mysql-connector-c++-8.0.15-src/jdbc/driver/nativeapi/mysql_native_connection_wrapper.cpp  diff -Nrup a/jdbc/driver/nativeapi/mysql_native_connection_wrapper.cpp b/jdbc/driver/nativeapi/mysql_native_connection_wrapper.cpp
214  --- mysql-connector-c++-8.0.15-org/jdbc/driver/nativeapi/mysql_native_connection_wrapper.cpp    2018-10-11 17:09:50.000000000 +0300  --- a/jdbc/driver/nativeapi/mysql_native_connection_wrapper.cpp 2022-12-09 08:00:36.000000000 +0100
215  +++ mysql-connector-c++-8.0.15-src/jdbc/driver/nativeapi/mysql_native_connection_wrapper.cpp    2019-02-16 12:28:44.323460095 +0200  +++ b/jdbc/driver/nativeapi/mysql_native_connection_wrapper.cpp 2023-01-22 19:09:06.389919062 +0100
216  @@ -97,11 +97,11 @@  @@ -97,11 +97,11 @@ get_mysql_option(sql::mysql::MySQL_Conne
217     case sql::mysql::MYSQL_OPT_MAX_ALLOWED_PACKET: return ::MYSQL_OPT_MAX_ALLOWED_PACKET;     case sql::mysql::MYSQL_OPT_MAX_ALLOWED_PACKET: return ::MYSQL_OPT_MAX_ALLOWED_PACKET;
218     case sql::mysql::MYSQL_OPT_NET_BUFFER_LENGTH: return ::MYSQL_OPT_NET_BUFFER_LENGTH;     case sql::mysql::MYSQL_OPT_NET_BUFFER_LENGTH: return ::MYSQL_OPT_NET_BUFFER_LENGTH;
219     case sql::mysql::MYSQL_OPT_TLS_VERSION: return ::MYSQL_OPT_TLS_VERSION;     case sql::mysql::MYSQL_OPT_TLS_VERSION: return ::MYSQL_OPT_TLS_VERSION;
# Line 192  diff -uNr mysql-connector-c++-8.0.15-org Line 227  diff -uNr mysql-connector-c++-8.0.15-org
227     case sql::mysql::MYSQL_OPT_RETRY_COUNT: return ::MYSQL_OPT_RETRY_COUNT;     case sql::mysql::MYSQL_OPT_RETRY_COUNT: return ::MYSQL_OPT_RETRY_COUNT;
228     case sql::mysql::MYSQL_OPT_GET_SERVER_PUBLIC_KEY: return ::MYSQL_OPT_GET_SERVER_PUBLIC_KEY;     case sql::mysql::MYSQL_OPT_GET_SERVER_PUBLIC_KEY: return ::MYSQL_OPT_GET_SERVER_PUBLIC_KEY;
229     case sql::mysql::MYSQL_OPT_OPTIONAL_RESULTSET_METADATA: return ::MYSQL_OPT_OPTIONAL_RESULTSET_METADATA;     case sql::mysql::MYSQL_OPT_OPTIONAL_RESULTSET_METADATA: return ::MYSQL_OPT_OPTIONAL_RESULTSET_METADATA;
230  diff -uNr mysql-connector-c++-8.0.15-org/jdbc/driver/nativeapi/mysql_native_connection_wrapper.h mysql-connector-c++-8.0.15-src/jdbc/driver/nativeapi/mysql_native_connection_wrapper.h  diff -Nrup a/jdbc/driver/nativeapi/mysql_native_connection_wrapper.h b/jdbc/driver/nativeapi/mysql_native_connection_wrapper.h
231  --- mysql-connector-c++-8.0.15-org/jdbc/driver/nativeapi/mysql_native_connection_wrapper.h      2018-10-11 17:09:50.000000000 +0300  --- a/jdbc/driver/nativeapi/mysql_native_connection_wrapper.h   2022-12-09 08:00:36.000000000 +0100
232  +++ mysql-connector-c++-8.0.15-src/jdbc/driver/nativeapi/mysql_native_connection_wrapper.h      2019-02-16 12:26:42.476429900 +0200  +++ b/jdbc/driver/nativeapi/mysql_native_connection_wrapper.h   2023-01-22 19:09:34.197152171 +0100
233  @@ -60,7 +60,7 @@  @@ -60,7 +60,7 @@ class MySQL_NativeConnectionWrapper : pu
234     boost::shared_ptr< IMySQLCAPI >      api;     boost::shared_ptr< IMySQLCAPI >      api;
235    
236    
# Line 204  diff -uNr mysql-connector-c++-8.0.15-org Line 239  diff -uNr mysql-connector-c++-8.0.15-org
239   struct MYSQL* mysql;   struct MYSQL* mysql;
240   #else   #else
241   struct st_mysql* mysql;   struct st_mysql* mysql;
242  diff -uNr mysql-connector-c++-8.0.15-org/jdbc/driver/nativeapi/mysql_native_resultset_wrapper.h mysql-connector-c++-8.0.15-src/jdbc/driver/nativeapi/mysql_native_resultset_wrapper.h  diff -Nrup a/jdbc/driver/nativeapi/mysql_native_resultset_wrapper.h b/jdbc/driver/nativeapi/mysql_native_resultset_wrapper.h
243  --- mysql-connector-c++-8.0.15-org/jdbc/driver/nativeapi/mysql_native_resultset_wrapper.h       2018-10-11 17:09:50.000000000 +0300  --- a/jdbc/driver/nativeapi/mysql_native_resultset_wrapper.h    2022-12-09 08:00:36.000000000 +0100
244  +++ mysql-connector-c++-8.0.15-src/jdbc/driver/nativeapi/mysql_native_resultset_wrapper.h       2019-02-16 12:26:42.480429868 +0200  +++ b/jdbc/driver/nativeapi/mysql_native_resultset_wrapper.h    2023-01-22 19:10:19.469531313 +0100
245  @@ -38,7 +38,7 @@  @@ -38,7 +38,7 @@
246   #include "native_resultset_wrapper.h"   #include "native_resultset_wrapper.h"
247   #include "../cppconn/version_info.h"   #include "../cppconn/version_info.h"
# Line 214  diff -uNr mysql-connector-c++-8.0.15-org Line 249  diff -uNr mysql-connector-c++-8.0.15-org
249  -#if (MYCPPCONN_STATIC_MYSQL_VERSION_ID > 80004)  -#if (MYCPPCONN_STATIC_MYSQL_VERSION_ID > 80004)
250  +#if (MYCPPCONN_STATIC_MYSQL_VERSION_ID > 80004 && !defined(MYCPPCONN_MARIADB_BUILD))  +#if (MYCPPCONN_STATIC_MYSQL_VERSION_ID > 80004 && !defined(MYCPPCONN_MARIADB_BUILD))
251   struct MYSQL_RES;   struct MYSQL_RES;
252     struct MYSQL;
253   #else   #else
254   struct st_mysql_res;  diff -Nrup a/jdbc/driver/nativeapi/mysql_native_statement_wrapper.h b/jdbc/driver/nativeapi/mysql_native_statement_wrapper.h
255  diff -uNr mysql-connector-c++-8.0.15-org/jdbc/driver/nativeapi/mysql_native_statement_wrapper.h mysql-connector-c++-8.0.15-src/jdbc/driver/nativeapi/mysql_native_statement_wrapper.h  --- a/jdbc/driver/nativeapi/mysql_native_statement_wrapper.h    2022-12-09 08:00:36.000000000 +0100
256  --- mysql-connector-c++-8.0.15-org/jdbc/driver/nativeapi/mysql_native_statement_wrapper.h       2018-10-11 17:09:50.000000000 +0300  +++ b/jdbc/driver/nativeapi/mysql_native_statement_wrapper.h    2023-01-22 19:12:05.383416675 +0100
 +++ mysql-connector-c++-8.0.15-src/jdbc/driver/nativeapi/mysql_native_statement_wrapper.h       2019-02-16 12:26:42.480429868 +0200  
257  @@ -38,7 +38,7 @@  @@ -38,7 +38,7 @@
258    
259   #include "native_statement_wrapper.h"   #include "native_statement_wrapper.h"
# Line 228  diff -uNr mysql-connector-c++-8.0.15-org Line 263  diff -uNr mysql-connector-c++-8.0.15-org
263   struct MYSQL_STMT;   struct MYSQL_STMT;
264   #else   #else
265   struct st_mysql_stmt;   struct st_mysql_stmt;
266  diff -uNr mysql-connector-c++-8.0.25-src/jdbc/driver/nativeapi/native_connection_wrapper.h mysql-connector-c++-8.0.25-mod/jdbc/driver/nativeapi/native_connection_wrapper.h  diff -Nrup a/jdbc/driver/nativeapi/native_connection_wrapper.h b/jdbc/driver/nativeapi/native_connection_wrapper.h
267  --- mysql-connector-c++-8.0.25-src/jdbc/driver/nativeapi/native_connection_wrapper.h    2021-03-15 17:21:15.000000000 +0200  --- a/jdbc/driver/nativeapi/native_connection_wrapper.h 2022-12-09 08:00:36.000000000 +0100
268  +++ mysql-connector-c++-8.0.25-mod/jdbc/driver/nativeapi/native_connection_wrapper.h    2021-05-12 15:54:14.223060673 +0300  +++ b/jdbc/driver/nativeapi/native_connection_wrapper.h 2023-01-22 19:12:37.642685929 +0100
269  @@ -41,7 +41,7 @@  @@ -41,7 +41,7 @@
270    
271   #include "../mysql_connection_options.h"   #include "../mysql_connection_options.h"
# Line 240  diff -uNr mysql-connector-c++-8.0.25-src Line 275  diff -uNr mysql-connector-c++-8.0.25-src
275   struct MYSQL_BIND;   struct MYSQL_BIND;
276   #else   #else
277   struct st_mysql_bind;   struct st_mysql_bind;
278  diff -uNr mysql-connector-c++-8.0.15-org/jdbc/driver/nativeapi/native_resultset_wrapper.h mysql-connector-c++-8.0.15-src/jdbc/driver/nativeapi/native_resultset_wrapper.h  diff -Nrup a/jdbc/driver/nativeapi/native_resultset_wrapper.h b/jdbc/driver/nativeapi/native_resultset_wrapper.h
279  --- mysql-connector-c++-8.0.15-org/jdbc/driver/nativeapi/native_resultset_wrapper.h     2018-10-11 17:09:50.000000000 +0300  --- a/jdbc/driver/nativeapi/native_resultset_wrapper.h  2022-12-09 08:00:36.000000000 +0100
280  +++ mysql-connector-c++-8.0.15-src/jdbc/driver/nativeapi/native_resultset_wrapper.h     2019-02-16 12:26:42.480429868 +0200  +++ b/jdbc/driver/nativeapi/native_resultset_wrapper.h  2023-01-22 19:13:08.348942065 +0100
281  @@ -41,7 +41,7 @@  @@ -41,7 +41,7 @@
282    
283   #include "../cppconn/version_info.h"   #include "../cppconn/version_info.h"
# Line 252  diff -uNr mysql-connector-c++-8.0.15-org Line 287  diff -uNr mysql-connector-c++-8.0.15-org
287   struct MYSQL_FIELD;   struct MYSQL_FIELD;
288   #else   #else
289   struct st_mysql_field;   struct st_mysql_field;
290  diff -uNr mysql-connector-c++-8.0.15-org/jdbc/driver/nativeapi/native_statement_wrapper.h mysql-connector-c++-8.0.15-src/jdbc/driver/nativeapi/native_statement_wrapper.h  diff -Nrup a/jdbc/driver/nativeapi/native_statement_wrapper.h b/jdbc/driver/nativeapi/native_statement_wrapper.h
291  --- mysql-connector-c++-8.0.15-org/jdbc/driver/nativeapi/native_statement_wrapper.h     2018-10-11 17:09:50.000000000 +0300  --- a/jdbc/driver/nativeapi/native_statement_wrapper.h  2022-12-09 08:00:36.000000000 +0100
292  +++ mysql-connector-c++-8.0.15-src/jdbc/driver/nativeapi/native_statement_wrapper.h     2019-02-16 12:26:42.480429868 +0200  +++ b/jdbc/driver/nativeapi/native_statement_wrapper.h  2023-01-22 19:13:37.903188462 +0100
293  @@ -42,7 +42,7 @@  @@ -42,7 +42,7 @@
294   #include "../mysql_statement_options.h"   #include "../mysql_statement_options.h"
295   #include <cppconn/version_info.h>   #include <cppconn/version_info.h>
# Line 264  diff -uNr mysql-connector-c++-8.0.15-org Line 299  diff -uNr mysql-connector-c++-8.0.15-org
299   struct MYSQL_BIND;   struct MYSQL_BIND;
300   struct MYSQL_RES;   struct MYSQL_RES;
301   #else   #else
302  diff -uNr mysql-connector-c++-8.0.15-org/jdbc/FindMySQL.cmake mysql-connector-c++-8.0.15-src/jdbc/FindMySQL.cmake  diff -Nrup a/jdbc/FindMySQL.cmake b/jdbc/FindMySQL.cmake
303  --- mysql-connector-c++-8.0.15-org/jdbc/FindMySQL.cmake 2018-10-11 17:09:50.000000000 +0300  --- a/jdbc/FindMySQL.cmake      2022-12-09 08:00:36.000000000 +0100
304  +++ mysql-connector-c++-8.0.15-src/jdbc/FindMySQL.cmake 2019-02-16 12:26:42.480429868 +0200  +++ b/jdbc/FindMySQL.cmake      2023-01-22 19:14:46.707761598 +0100
305  @@ -505,6 +505,8 @@  @@ -505,6 +505,8 @@ elseif(MYSQL_CONFIG_EXECUTABLE)
306                           "\"${MYSQL_CONFIG_EXECUTABLE}\"")                           "\"${MYSQL_CONFIG_EXECUTABLE}\"")
307     endif()     endif()
308    
Legend:
Removed from v.1769472  
changed lines
  Added in v.1935261
  ViewVC Help
Powered by ViewVC 1.1.30