Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package mysql-connector-cpp for
openSUSE:Factory checked in at 2023-02-10 14:34:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mysql-connector-cpp (Old)
and /work/SRC/openSUSE:Factory/.mysql-connector-cpp.new.1848 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mysql-connector-cpp"
Fri Feb 10 14:34:23 2023 rev:33 rq:1064070 version:8.0.32
Changes:
--------
--- /work/SRC/openSUSE:Factory/mysql-connector-cpp/mysql-connector-cpp.changes
2022-04-12 21:51:04.238459279 +0200
+++
/work/SRC/openSUSE:Factory/.mysql-connector-cpp.new.1848/mysql-connector-cpp.changes
2023-02-10 14:34:24.861595711 +0100
@@ -1,0 +2,12 @@
+Wed Feb 8 12:07:20 UTC 2023 - Hans-Peter Jansen <[email protected]>
+
+- Updated to version 8.0.32
+ * release notes:
+ https://dev.mysql.com/doc/relnotes/connector-cpp/en/news-8-0-32.html
+- Rebased mysql-connector-cpp-config.patch
+- Fixed mysql-connector-cpp-config.patch to exclude more unsupported
+- Add a compile fix for the is_same test in
+ mysql-connector-cpp-test-feature.patch
+- Add various fixes to mysql-connector-cpp-use-system-protobuf.patch
+
+-------------------------------------------------------------------
Old:
----
mysql-connector-c++-8.0.28-src.tar.gz
New:
----
mysql-connector-c++-8.0.32-src.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mysql-connector-cpp.spec ++++++
--- /var/tmp/diff_new_pack.QvYIFc/_old 2023-02-10 14:34:25.273598172 +0100
+++ /var/tmp/diff_new_pack.QvYIFc/_new 2023-02-10 14:34:25.281598220 +0100
@@ -1,7 +1,7 @@
#
# spec file for package mysql-connector-cpp
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
%define libname libmysqlcppconn9
%define x_libname libmysqlcppconn8-2
Name: mysql-connector-cpp
-Version: 8.0.28
+Version: 8.0.32
Release: 0
Summary: MySQL Connector/C++: Standardized database driver for C++
development
License: SUSE-GPL-2.0-with-FLOSS-exception
++++++ mysql-connector-c++-8.0.28-src.tar.gz ->
mysql-connector-c++-8.0.32-src.tar.gz ++++++
++++ 638261 lines of diff (skipped)
++++++ mysql-connector-cpp-config.patch ++++++
--- /var/tmp/diff_new_pack.QvYIFc/_old 2023-02-10 14:34:26.413604985 +0100
+++ /var/tmp/diff_new_pack.QvYIFc/_new 2023-02-10 14:34:26.417605008 +0100
@@ -1,6 +1,8 @@
---- mysql-connector-c++-8.0.22-new/jdbc/cmake/DepFindMySQL.cmake.pre
2020-09-02 19:04:07.000000000 +0300
-+++ mysql-connector-c++-8.0.22-new/jdbc/cmake/DepFindMySQL.cmake
2020-12-08 01:28:25.680029053 +0200
-@@ -469,9 +469,9 @@
+Index: b/jdbc/cmake/DepFindMySQL.cmake
+===================================================================
+--- a/jdbc/cmake/DepFindMySQL.cmake
++++ b/jdbc/cmake/DepFindMySQL.cmake
+@@ -490,9 +490,9 @@ function(use_mysql_config)
# Install location
++++++ mysql-connector-cpp-mariadb.patch ++++++
--- /var/tmp/diff_new_pack.QvYIFc/_old 2023-02-10 14:34:26.433605104 +0100
+++ /var/tmp/diff_new_pack.QvYIFc/_new 2023-02-10 14:34:26.437605128 +0100
@@ -1,17 +1,19 @@
-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
---- mysql-connector-c++-8.0.15-org/jdbc/cppconn/version_info.h.cmake
2018-10-11 17:09:50.000000000 +0300
-+++ mysql-connector-c++-8.0.15-src/jdbc/cppconn/version_info.h.cmake
2019-02-16 12:24:40.553400318 +0200
-@@ -42,5 +42,6 @@
+Index: b/jdbc/cppconn/version_info.h.cmake
+===================================================================
+--- a/jdbc/cppconn/version_info.h.cmake
++++ b/jdbc/cppconn/version_info.h.cmake
+@@ -48,5 +48,6 @@
#define MYCPPCONN_STATIC_MYSQL_VERSION "@MYSQL_VERSION@"
#define MYCPPCONN_STATIC_MYSQL_VERSION_ID @MYSQL_NUM_VERSION@
+#define MYCPPCONN_MARIADB_BUILD
#define MYCPPCONN_BOOST_VERSION @Boost_VERSION@
-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
---- mysql-connector-c++-8.0.15-org/jdbc/driver/mysql_connection.cpp
2018-10-11 17:09:50.000000000 +0300
-+++ mysql-connector-c++-8.0.15-src/jdbc/driver/mysql_connection.cpp
2019-02-16 12:27:46.395921145 +0200
-@@ -254,7 +254,7 @@
+Index: b/jdbc/driver/mysql_connection.cpp
+===================================================================
+--- a/jdbc/driver/mysql_connection.cpp
++++ b/jdbc/driver/mysql_connection.cpp
+@@ -268,7 +268,7 @@ static const String2IntMap booleanOption
{OPT_CAN_HANDLE_EXPIRED_PASSWORDS,
MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS, true},
{OPT_CONNECT_ATTR_RESET, MYSQL_OPT_CONNECT_ATTR_RESET, true},
{OPT_RECONNECT, MYSQL_OPT_RECONNECT, true},
@@ -20,27 +22,29 @@
{"sslVerify", MYSQL_OPT_SSL_VERIFY_SERVER_CERT, false},
// Deprecated
{"sslEnforce", MYSQL_OPT_SSL_ENFORCE, false} //
Deprecated
#else
-@@ -276,8 +276,8 @@
+@@ -290,9 +290,9 @@ static const String2IntMap intOptions[]=
{OPT_MAX_ALLOWED_PACKET, MYSQL_OPT_MAX_ALLOWED_PACKET, false},
{OPT_NET_BUFFER_LENGTH, MYSQL_OPT_NET_BUFFER_LENGTH, false},
#endif
- {OPT_SSL_MODE, MYSQL_OPT_SSL_MODE , false},
+- {"OPT_SSL_MODE", MYSQL_OPT_SSL_MODE , false},
-#if MYCPPCONN_STATIC_MYSQL_VERSION_ID >= 80000
+ //{OPT_SSL_MODE, MYSQL_OPT_SSL_MODE , false},
++ //{"OPT_SSL_MODE", MYSQL_OPT_SSL_MODE , false},
+#if MYCPPCONN_STATIC_MYSQL_VERSION_ID >= 80000 &&
!defined(MYCPPCONN_MARIADB_BUILD)
{OPT_RETRY_COUNT, MYSQL_OPT_RETRY_COUNT, false},
#endif
};
-@@ -303,7 +303,7 @@
- #if MYCPPCONN_STATIC_MYSQL_VERSION_ID >= 50700
+@@ -321,7 +321,7 @@ static const String2IntMap stringOptions
{OPT_TLS_VERSION, MYSQL_OPT_TLS_VERSION, true},
+ {"OPT_TLS_VERSION", MYSQL_OPT_TLS_VERSION, true},
#endif
- {OPT_LOAD_DATA_LOCAL_DIR, MYSQL_OPT_LOAD_DATA_LOCAL_DIR, false}
+ //{OPT_LOAD_DATA_LOCAL_DIR, MYSQL_OPT_LOAD_DATA_LOCAL_DIR, false}
};
-@@ -311,7 +311,7 @@
+@@ -330,7 +330,7 @@ static const String2IntMap stringOptions
inline
::sql::mysql::MySQL_Connection_Options option_conversion(unsigned long
client_version, int option)
{
@@ -49,7 +53,7 @@
if(client_version <80011)
{
switch (option) {
-@@ -593,7 +593,7 @@
+@@ -520,7 +520,7 @@ void MySQL_Connection::init(ConnectOptio
int client_exp_pwd = false;
bool opt_dns_srv = false;
bool opt_multi_host = false;
@@ -58,7 +62,7 @@
bool secure_auth= true;
#endif
-@@ -602,7 +602,7 @@
+@@ -636,7 +636,7 @@ void MySQL_Connection::init(ConnectOptio
} else {
throw sql::InvalidArgumentException("No string value passed for
password");
}
@@ -67,7 +71,7 @@
try {
p_s = (it->second).get< sql::SQLString >();
} catch (sql::InvalidArgumentException&) {
-@@ -638,7 +638,7 @@
+@@ -672,7 +672,7 @@ void MySQL_Connection::init(ConnectOptio
} else {
throw sql::InvalidArgumentException("No string value passed for
password3");
}
@@ -76,7 +80,7 @@
try {
p_i = (it->second).get< int >();
} catch (sql::InvalidArgumentException&) {
-@@ -902,7 +902,7 @@
+@@ -936,7 +936,7 @@ void MySQL_Connection::init(ConnectOptio
} catch (sql::InvalidArgumentException&) {
throw sql::InvalidArgumentException("Wrong type passed for
useLegacyAuth expected sql::SQLString");
}
@@ -85,7 +89,7 @@
if (p_b) {
secure_auth= !*p_b;
} else {
-@@ -944,7 +944,7 @@
+@@ -978,7 +978,7 @@ void MySQL_Connection::init(ConnectOptio
} else if (!it->first.compare(OPT_CONNECT_ATTR_RESET)) {
proxy->options(MYSQL_OPT_CONNECT_ATTR_RESET, 0);
@@ -94,23 +98,23 @@
//Deprecated
} else if (!it->first.compare("sslVerify")) {
-@@ -961,6 +961,7 @@
- throw sql::InvalidArgumentException("Wrong type passed for
OPT_OCI_CONFIG_FILE. Expected sql::SQLString.");
- }
+@@ -993,7 +993,6 @@ void MySQL_Connection::init(ConnectOptio
+ :
SSL_MODE_PREFERRED;
+ proxy->options(MYSQL_OPT_SSL_MODE, &ssl_mode_val);
-+ /*
+- #endif
+ } else if (!it->first.compare(OPT_OCI_CONFIG_FILE)) {
try {
- proxy->plugin_option(MYSQL_CLIENT_AUTHENTICATION_PLUGIN,
- "authentication_oci_client",
-@@ -972,6 +972,7 @@
- OPT_OCI_CONFIG_FILE
- );
+ p_s= (it->second).get<sql::SQLString>();
+@@ -1035,6 +1034,7 @@ void MySQL_Connection::init(ConnectOptio
+ OPT_AUTHENTICATION_KERBEROS_CLIENT_MODE);
}
-+ */
+ #endif // defined(_WIN32)
++ #endif // MYCPPCONN_STATIC_MYSQL_VERSION_ID > 80000 &&
!defined(MYCPPCONN_MARIADB_BUILD)
- }
- else if (!it->first.compare(OPT_PLUGIN_DIR)) {
-@@ -1000,7 +1000,7 @@
+ } else if (!it->first.compare(OPT_PLUGIN_DIR)) {
+ // Nothing to do here: this option was handeld before the loop
+@@ -1080,7 +1080,7 @@ void MySQL_Connection::init(ConnectOptio
}
@@ -119,7 +123,23 @@
try {
proxy->options(MYSQL_SECURE_AUTH, &secure_auth);
} catch (sql::InvalidArgumentException& e) {
-@@ -1772,7 +1772,7 @@
+@@ -1215,6 +1215,7 @@ void MySQL_Connection::init(ConnectOptio
+
+ }
+
++ #if !defined(MYCPPCONN_MARIADB_BUILD)
+ /*
+ * Helper class to simplify setting and resetting of the plugin callback.
+ */
+@@ -1272,6 +1273,7 @@ void MySQL_Connection::init(ConnectOptio
+ Fido_Callback_Setter setter(
+ static_cast<MySQL_Driver*>(driver)->fido_callback,
+ proxy.get());
++ #endif // !defined(MYCPPCONN_MARIADB_BUILD)
+
+ //Connect loop
+ {
+@@ -1846,7 +1848,7 @@ MySQL_Connection::setClientOption(const
#endif
} else if (!optionName.compare(OPT_LOAD_DATA_LOCAL_DIR))
{
@@ -128,10 +148,11 @@
}
return this;
}
-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
---- mysql-connector-c++-8.0.15-org/jdbc/driver/mysql_connection_options.h
2018-10-11 17:09:50.000000000 +0300
-+++ mysql-connector-c++-8.0.15-src/jdbc/driver/mysql_connection_options.h
2019-02-16 12:26:42.476429900 +0200
-@@ -41,7 +41,7 @@
+Index: b/jdbc/driver/mysql_connection_options.h
+===================================================================
+--- a/jdbc/driver/mysql_connection_options.h
++++ b/jdbc/driver/mysql_connection_options.h
+@@ -41,7 +41,7 @@ namespace mysql
enum MySQL_Connection_Options
{
@@ -140,7 +161,7 @@
MYSQL_OPT_CONNECT_TIMEOUT, MYSQL_OPT_COMPRESS, MYSQL_OPT_NAMED_PIPE,
MYSQL_INIT_COMMAND, MYSQL_READ_DEFAULT_FILE, MYSQL_READ_DEFAULT_GROUP,
MYSQL_SET_CHARSET_DIR, MYSQL_SET_CHARSET_NAME, MYSQL_OPT_LOCAL_INFILE,
-@@ -86,8 +86,8 @@
+@@ -92,8 +92,8 @@ enum MySQL_Connection_Options
MYSQL_OPT_SSL_ENFORCE,
#if MYCPPCONN_STATIC_MYSQL_VERSION_ID >= 50700
MYSQL_OPT_MAX_ALLOWED_PACKET, MYSQL_OPT_NET_BUFFER_LENGTH,
@@ -151,9 +172,10 @@
#endif //MYCPPCONN_STATIC_MYSQL_VERSION_ID >= 50700
#endif //MYCPPCONN_STATIC_MYSQL_VERSION_ID >= 80000
-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
---- mysql-connector-c++-8.0.15-org/jdbc/driver/mysql_resultset_metadata.h
2018-10-11 17:09:50.000000000 +0300
-+++ mysql-connector-c++-8.0.15-src/jdbc/driver/mysql_resultset_metadata.h
2019-02-16 12:26:42.476429900 +0200
+Index: b/jdbc/driver/mysql_resultset_metadata.h
+===================================================================
+--- a/jdbc/driver/mysql_resultset_metadata.h
++++ b/jdbc/driver/mysql_resultset_metadata.h
@@ -38,7 +38,7 @@
#include <cppconn/resultset_metadata.h>
#include <cppconn/version_info.h>
@@ -163,10 +185,11 @@
struct MYSQL_FIELD;
#else
struct st_mysql_field;
-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
----
mysql-connector-c++-8.0.15-org/jdbc/driver/nativeapi/libmysql_static_proxy.cpp
2018-10-11 17:09:50.000000000 +0300
-+++
mysql-connector-c++-8.0.15-src/jdbc/driver/nativeapi/libmysql_static_proxy.cpp
2019-02-16 12:26:42.476429900 +0200
-@@ -326,7 +326,7 @@
+Index: b/jdbc/driver/nativeapi/libmysql_static_proxy.cpp
+===================================================================
+--- a/jdbc/driver/nativeapi/libmysql_static_proxy.cpp
++++ b/jdbc/driver/nativeapi/libmysql_static_proxy.cpp
+@@ -326,7 +326,7 @@ int
LibmysqlStaticProxy::get_option(MYSQL * mysql, enum mysql_option option,
const void *arg)
{
#if MYSQL_VERSION_ID >= 50703
@@ -175,10 +198,11 @@
throw sql::InvalidArgumentException("Unsupported option provided to
mysql_get_option()");
} else {
return 0;
-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
----
mysql-connector-c++-8.0.15-org/jdbc/driver/nativeapi/mysql_native_connection_wrapper.cpp
2018-10-11 17:09:50.000000000 +0300
-+++
mysql-connector-c++-8.0.15-src/jdbc/driver/nativeapi/mysql_native_connection_wrapper.cpp
2019-02-16 12:28:44.323460095 +0200
-@@ -97,11 +97,11 @@
+Index: b/jdbc/driver/nativeapi/mysql_native_connection_wrapper.cpp
+===================================================================
+--- a/jdbc/driver/nativeapi/mysql_native_connection_wrapper.cpp
++++ b/jdbc/driver/nativeapi/mysql_native_connection_wrapper.cpp
+@@ -97,11 +97,11 @@ get_mysql_option(sql::mysql::MySQL_Conne
case sql::mysql::MYSQL_OPT_MAX_ALLOWED_PACKET: return
::MYSQL_OPT_MAX_ALLOWED_PACKET;
case sql::mysql::MYSQL_OPT_NET_BUFFER_LENGTH: return
::MYSQL_OPT_NET_BUFFER_LENGTH;
case sql::mysql::MYSQL_OPT_TLS_VERSION: return ::MYSQL_OPT_TLS_VERSION;
@@ -192,10 +216,11 @@
case sql::mysql::MYSQL_OPT_RETRY_COUNT: return ::MYSQL_OPT_RETRY_COUNT;
case sql::mysql::MYSQL_OPT_GET_SERVER_PUBLIC_KEY: return
::MYSQL_OPT_GET_SERVER_PUBLIC_KEY;
case sql::mysql::MYSQL_OPT_OPTIONAL_RESULTSET_METADATA: return
::MYSQL_OPT_OPTIONAL_RESULTSET_METADATA;
-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
----
mysql-connector-c++-8.0.15-org/jdbc/driver/nativeapi/mysql_native_connection_wrapper.h
2018-10-11 17:09:50.000000000 +0300
-+++
mysql-connector-c++-8.0.15-src/jdbc/driver/nativeapi/mysql_native_connection_wrapper.h
2019-02-16 12:26:42.476429900 +0200
-@@ -60,7 +60,7 @@
+Index: b/jdbc/driver/nativeapi/mysql_native_connection_wrapper.h
+===================================================================
+--- a/jdbc/driver/nativeapi/mysql_native_connection_wrapper.h
++++ b/jdbc/driver/nativeapi/mysql_native_connection_wrapper.h
+@@ -60,7 +60,7 @@ class MySQL_NativeConnectionWrapper : pu
boost::shared_ptr< IMySQLCAPI > api;
@@ -204,9 +229,10 @@
struct MYSQL* mysql;
#else
struct st_mysql* mysql;
-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
----
mysql-connector-c++-8.0.15-org/jdbc/driver/nativeapi/mysql_native_resultset_wrapper.h
2018-10-11 17:09:50.000000000 +0300
-+++
mysql-connector-c++-8.0.15-src/jdbc/driver/nativeapi/mysql_native_resultset_wrapper.h
2019-02-16 12:26:42.480429868 +0200
+Index: b/jdbc/driver/nativeapi/mysql_native_resultset_wrapper.h
+===================================================================
+--- a/jdbc/driver/nativeapi/mysql_native_resultset_wrapper.h
++++ b/jdbc/driver/nativeapi/mysql_native_resultset_wrapper.h
@@ -38,7 +38,7 @@
#include "native_resultset_wrapper.h"
#include "../cppconn/version_info.h"
@@ -214,11 +240,12 @@
-#if (MYCPPCONN_STATIC_MYSQL_VERSION_ID > 80004)
+#if (MYCPPCONN_STATIC_MYSQL_VERSION_ID > 80004 &&
!defined(MYCPPCONN_MARIADB_BUILD))
struct MYSQL_RES;
+ struct MYSQL;
#else
- struct st_mysql_res;
-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
----
mysql-connector-c++-8.0.15-org/jdbc/driver/nativeapi/mysql_native_statement_wrapper.h
2018-10-11 17:09:50.000000000 +0300
-+++
mysql-connector-c++-8.0.15-src/jdbc/driver/nativeapi/mysql_native_statement_wrapper.h
2019-02-16 12:26:42.480429868 +0200
+Index: b/jdbc/driver/nativeapi/mysql_native_statement_wrapper.h
+===================================================================
+--- a/jdbc/driver/nativeapi/mysql_native_statement_wrapper.h
++++ b/jdbc/driver/nativeapi/mysql_native_statement_wrapper.h
@@ -38,7 +38,7 @@
#include "native_statement_wrapper.h"
@@ -228,9 +255,10 @@
struct MYSQL_STMT;
#else
struct st_mysql_stmt;
-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
----
mysql-connector-c++-8.0.25-src/jdbc/driver/nativeapi/native_connection_wrapper.h
2021-03-15 17:21:15.000000000 +0200
-+++
mysql-connector-c++-8.0.25-mod/jdbc/driver/nativeapi/native_connection_wrapper.h
2021-05-12 15:54:14.223060673 +0300
+Index: b/jdbc/driver/nativeapi/native_connection_wrapper.h
+===================================================================
+--- a/jdbc/driver/nativeapi/native_connection_wrapper.h
++++ b/jdbc/driver/nativeapi/native_connection_wrapper.h
@@ -41,7 +41,7 @@
#include "../mysql_connection_options.h"
@@ -240,9 +268,10 @@
struct MYSQL_BIND;
#else
struct st_mysql_bind;
-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
----
mysql-connector-c++-8.0.15-org/jdbc/driver/nativeapi/native_resultset_wrapper.h
2018-10-11 17:09:50.000000000 +0300
-+++
mysql-connector-c++-8.0.15-src/jdbc/driver/nativeapi/native_resultset_wrapper.h
2019-02-16 12:26:42.480429868 +0200
+Index: b/jdbc/driver/nativeapi/native_resultset_wrapper.h
+===================================================================
+--- a/jdbc/driver/nativeapi/native_resultset_wrapper.h
++++ b/jdbc/driver/nativeapi/native_resultset_wrapper.h
@@ -41,7 +41,7 @@
#include "../cppconn/version_info.h"
@@ -252,9 +281,10 @@
struct MYSQL_FIELD;
#else
struct st_mysql_field;
-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
----
mysql-connector-c++-8.0.15-org/jdbc/driver/nativeapi/native_statement_wrapper.h
2018-10-11 17:09:50.000000000 +0300
-+++
mysql-connector-c++-8.0.15-src/jdbc/driver/nativeapi/native_statement_wrapper.h
2019-02-16 12:26:42.480429868 +0200
+Index: b/jdbc/driver/nativeapi/native_statement_wrapper.h
+===================================================================
+--- a/jdbc/driver/nativeapi/native_statement_wrapper.h
++++ b/jdbc/driver/nativeapi/native_statement_wrapper.h
@@ -42,7 +42,7 @@
#include "../mysql_statement_options.h"
#include <cppconn/version_info.h>
@@ -264,10 +294,11 @@
struct MYSQL_BIND;
struct MYSQL_RES;
#else
-diff -uNr mysql-connector-c++-8.0.15-org/jdbc/FindMySQL.cmake
mysql-connector-c++-8.0.15-src/jdbc/FindMySQL.cmake
---- mysql-connector-c++-8.0.15-org/jdbc/FindMySQL.cmake 2018-10-11
17:09:50.000000000 +0300
-+++ mysql-connector-c++-8.0.15-src/jdbc/FindMySQL.cmake 2019-02-16
12:26:42.480429868 +0200
-@@ -505,6 +505,8 @@
+Index: b/jdbc/FindMySQL.cmake
+===================================================================
+--- a/jdbc/FindMySQL.cmake
++++ b/jdbc/FindMySQL.cmake
+@@ -505,6 +505,8 @@ elseif(MYSQL_CONFIG_EXECUTABLE)
"\"${MYSQL_CONFIG_EXECUTABLE}\"")
endif()
++++++ mysql-connector-cpp-test-feature.patch ++++++
--- /var/tmp/diff_new_pack.QvYIFc/_old 2023-02-10 14:34:26.449605200 +0100
+++ /var/tmp/diff_new_pack.QvYIFc/_new 2023-02-10 14:34:26.457605247 +0100
@@ -1,6 +1,8 @@
----
mysql-connector-c++-8.0.25-src/jdbc/driver/nativeapi/mysql_native_connection_wrapper.cpp
2021-03-15 17:21:15.000000000 +0200
-+++
mysql-connector-c++-8.0.25-mod/jdbc/driver/nativeapi/mysql_native_connection_wrapper.cpp
2021-05-12 17:23:50.806629061 +0300
-@@ -403,7 +403,11 @@
+Index: b/jdbc/driver/nativeapi/mysql_native_connection_wrapper.cpp
+===================================================================
+--- a/jdbc/driver/nativeapi/mysql_native_connection_wrapper.cpp
++++ b/jdbc/driver/nativeapi/mysql_native_connection_wrapper.cpp
+@@ -479,7 +479,11 @@ int MySQL_NativeConnectionWrapper::get_p
/* {{{ MySQL_NativeConnectionWrapper::has_query_attributes() */
bool MySQL_NativeConnectionWrapper::has_query_attributes()
{
@@ -12,4 +14,18 @@
}
/* }}} */
+Index: b/cdk/include/mysql/cdk/foundation/CMakeLists.txt
+===================================================================
+--- a/cdk/include/mysql/cdk/foundation/CMakeLists.txt
++++ b/cdk/include/mysql/cdk/foundation/CMakeLists.txt
+@@ -48,7 +48,8 @@ CHECK_CXX_SOURCE_COMPILES(
+ ADD_CONFIG(HAVE_STATIC_ASSERT)
+
+ CHECK_CXX_SOURCE_COMPILES(
+- "void main() { return is_same<bool,char>::value; }"
++ "#include <type_traits>
++ int main() { return std::is_same<bool,char>::value; }"
+ HAVE_IS_SAME)
+ ADD_CONFIG(HAVE_IS_SAME)
+
++++++ mysql-connector-cpp-use-system-protobuf.patch ++++++
--- /var/tmp/diff_new_pack.QvYIFc/_old 2023-02-10 14:34:26.473605343 +0100
+++ /var/tmp/diff_new_pack.QvYIFc/_new 2023-02-10 14:34:26.477605367 +0100
@@ -1,30 +1,39 @@
-diff -uNr mysql-connector-c++-8.0.20-org/cdk/CMakeLists.txt
mysql-connector-c++-8.0.20-src/cdk/CMakeLists.txt
---- mysql-connector-c++-8.0.20-org/cdk/CMakeLists.txt 2020-03-13
22:10:58.000000000 +0200
-+++ mysql-connector-c++-8.0.20-src/cdk/CMakeLists.txt 2020-05-13
18:37:49.147107797 +0300
-@@ -97,6 +97,7 @@
+Index: b/cdk/CMakeLists.txt
+===================================================================
+--- a/cdk/CMakeLists.txt
++++ b/cdk/CMakeLists.txt
+@@ -97,6 +97,7 @@ find_dependency(SSL)
#find_dependency(Protobuf)
find_dependency(RapidJSON)
find_dependency(Coverage)
-+find_package(Protobuf REQUIRED)
++#find_package(Protobuf REQUIRED)
# TODO: These macros should not be used in public headers because they are
-diff -uNr mysql-connector-c++-8.0.20-org/cdk/core/CMakeLists.txt
mysql-connector-c++-8.0.20-src/cdk/core/CMakeLists.txt
---- mysql-connector-c++-8.0.20-org/cdk/core/CMakeLists.txt 2020-03-13
22:10:58.000000000 +0200
-+++ mysql-connector-c++-8.0.20-src/cdk/core/CMakeLists.txt 2020-05-13
18:37:49.147107797 +0300
-@@ -45,7 +45,7 @@
+Index: b/cdk/protocol/mysqlx/CMakeLists.txt
+===================================================================
+--- a/cdk/protocol/mysqlx/CMakeLists.txt
++++ b/cdk/protocol/mysqlx/CMakeLists.txt
+@@ -26,7 +26,8 @@
+ # along with this program; if not, write to the Free Software Foundation,
Inc.,
+ # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- target_link_libraries(cdk
- PUBLIC cdk_mysqlx cdk_parser
-- PRIVATE ext::pb-lite # required by codecc.cc
-+ PRIVATE protobuf::libprotobuf-lite # required by codecc.cc
- )
+-find_dependency(Protobuf)
++#find_dependency(Protobuf)
++find_package(Protobuf REQUIRED)
+ find_dependency(Compression)
- add_coverage(cdk)
-diff -uNr mysql-connector-c++-8.0.20-org/cdk/protocol/mysqlx/CMakeLists.txt
mysql-connector-c++-8.0.20-src/cdk/protocol/mysqlx/CMakeLists.txt
---- mysql-connector-c++-8.0.20-org/cdk/protocol/mysqlx/CMakeLists.txt
2020-03-13 22:10:58.000000000 +0200
-+++ mysql-connector-c++-8.0.20-src/cdk/protocol/mysqlx/CMakeLists.txt
2020-05-13 18:37:49.151107769 +0300
-@@ -109,6 +109,65 @@
+ include(CheckIncludeFile)
+@@ -39,7 +40,7 @@ add_config(HAVE_BYTEORDER_H)
+
+ add_config_option(DEBUG_PROTOBUF BOOL ADVANCED DEFAULT OFF "Debug Protobuf
messages")
+
+-set(use_full_protobuf ${WITH_TESTS})
++set(use_full_protobuf 1)
+
+ if (DEBUG_PROTOBUF)
+ message("Protobuf debugging enabled")
+@@ -111,6 +112,65 @@ if(NOT use_full_protobuf)
endif(NOT use_full_protobuf)
@@ -90,16 +99,34 @@
mysqlx_protobuf_generate_cpp(PB_SRCS PB_HDRS ${proto_mysqlx_defs})
-@@ -130,9 +187,9 @@
+@@ -129,11 +189,11 @@ target_include_directories(cdk_proto_mys
+ ${CMAKE_CURRENT_BINARY_DIR}
)
- if(use_full_protobuf)
-- target_link_libraries(cdk_proto_mysqlx PRIVATE ext::pb-full)
-+ target_link_libraries(cdk_proto_mysqlx PRIVATE protobuf::libprotobuf)
- else()
-- target_link_libraries(cdk_proto_mysqlx PRIVATE ext::pb-lite)
-+ target_link_libraries(cdk_proto_mysqlx PRIVATE protobuf::libprotobuf-lite)
- endif()
+-if(use_full_protobuf)
+- target_link_libraries(cdk_proto_mysqlx PRIVATE ext::protobuf)
+-else()
+- target_link_libraries(cdk_proto_mysqlx PRIVATE ext::protobuf-lite)
+-endif()
++#if(use_full_protobuf)
++# target_link_libraries(cdk_proto_mysqlx PRIVATE ext:protobuf)
++#else()
++# target_link_libraries(cdk_proto_mysqlx PRIVATE ext::protobuf-lite)
++#endif()
target_link_libraries(cdk_proto_mysqlx
+ PRIVATE cdk_foundation ext::z ext::lz4 ext::zstd
+Index: b/cdk/core/CMakeLists.txt
+===================================================================
+--- a/cdk/core/CMakeLists.txt
++++ b/cdk/core/CMakeLists.txt
+@@ -45,7 +45,7 @@ add_library(cdk STATIC ${cdk_sources} ${
+
+ target_link_libraries(cdk
+ PUBLIC cdk_mysqlx cdk_parser
+- PRIVATE ext::protobuf-lite # required by codecc.cc
++# PRIVATE ext::protobuf-lite # required by codecc.cc
+ )
+
+ add_coverage(cdk)
