Hello community,
here is the log from the commit of package mysql-connector-cpp for
openSUSE:Factory checked in at 2019-02-28 21:24:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mysql-connector-cpp (Old)
and /work/SRC/openSUSE:Factory/.mysql-connector-cpp.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mysql-connector-cpp"
Thu Feb 28 21:24:01 2019 rev:27 rq:678038 version:8.0.15
Changes:
--------
--- /work/SRC/openSUSE:Factory/mysql-connector-cpp/mysql-connector-cpp.changes
2018-09-11 17:13:27.651764955 +0200
+++
/work/SRC/openSUSE:Factory/.mysql-connector-cpp.new.28833/mysql-connector-cpp.changes
2019-02-28 21:24:02.997920130 +0100
@@ -1,0 +2,14 @@
+Sun Feb 17 08:18:37 UTC 2019 - Mykola Krachkovsky <[email protected]>
+
+- Updated to version 8.0.15
+ * release notes:
+ https://dev.mysql.com/doc/relnotes/connector-cpp/en/news-8-0.html
+- Introduced X API library - libmysqlcppconn8
+- Old JDBC-like API development files moved to jdbc subdirectory
+- fixed upstream, examples aren't built by default anymore
+ * removed mysql-connector-cpp-1.1.0-disable_tests_and_examples.patch
+- replace patch to match new paths & code formating
+ * removed mysql-connector-cpp-1.1.9-libmysql_dynamic_proxy_typos.patch
+ * added mysql-connector-cpp-8.0.12-libmysql_dynamic_proxy_typos.patch
+
+-------------------------------------------------------------------
Old:
----
mysql-connector-c++-1.1.9.tar.gz
mysql-connector-cpp-1.1.0-disable_tests_and_examples.patch
mysql-connector-cpp-1.1.9-libmysql_dynamic_proxy_typos.patch
New:
----
mysql-connector-c++-8.0.15-src.tar.gz
mysql-connector-cpp-8.0.12-libmysql_dynamic_proxy_typos.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mysql-connector-cpp.spec ++++++
--- /var/tmp/diff_new_pack.c3Lkel/_old 2019-02-28 21:24:03.533919950 +0100
+++ /var/tmp/diff_new_pack.c3Lkel/_new 2019-02-28 21:24:03.537919949 +0100
@@ -1,7 +1,7 @@
#
# spec file for package mysql-connector-cpp
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,23 +12,23 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%define libname libmysqlcppconn7
+%define x_libname libmysqlcppconn8-1
Name: mysql-connector-cpp
-Version: 1.1.9
+Version: 8.0.15
Release: 0
Summary: MySQL Connector/C++: Standardized database driver for C++
development
License: SUSE-GPL-2.0-with-FLOSS-exception
Group: Development/Libraries/C and C++
URL: http://dev.mysql.com/downloads/connector/
-Source:
http://dev.mysql.com/get/Downloads/Connector-C++/mysql-connector-c++-%{version}.tar.gz
-# PATCH-FEATURE-OPENSUSE -
mysql-connector-cpp-1.1.0-disable_tests_and_examples.patch [email protected] --
disable building tests and examples
-Patch2: mysql-connector-cpp-1.1.0-disable_tests_and_examples.patch
+Source:
http://dev.mysql.com/get/Downloads/Connector-C++/mysql-connector-c++-%{version}-src.tar.gz
# PATCH-FIX-UPSTREAM - bsc#1067883 [email protected] -- fix build with
libmariadb by fixing copypaste errors in libmysql_dynamic_proxy.cpp file
-Patch3: mysql-connector-cpp-1.1.9-libmysql_dynamic_proxy_typos.patch
+Patch3: mysql-connector-cpp-8.0.12-libmysql_dynamic_proxy_typos.patch
+# PATCH-FIX-OPENSUSE fix library to work with MariaDB instead of MySQL
Patch4: mysql-connector-cpp-mariadb.patch
BuildRequires: cmake >= 2.6.2
BuildRequires: gcc-c++
@@ -43,9 +43,13 @@
%endif
%description
-MySQL Connector/C++ is a MySQL database connector for C++ development. The
-MySQL driver for C++ can be used to connect to MySQL from C++ applications. The
-driver mimics the JDBC 4.0 API. It implements a significant subset of JDBC 4.0.
+MySQL Connector/C++ is a library for applications written in C or C++ that
+communicate with MySQL database servers. Version 8.0 of Connector/C++
+implements three different APIs which can be used by applications:
+
+* The new X DevAPI for applications written in C++.
+* The new X DevAPI for C for applications written in plain C.
+* The legacy JDBC4-based API also implemented in version 1.1 of the connector.
The Driver for C++ is designed to work best with MySQL 5.1 or later. Note - its
full functionality is not available when connecting to MySQL 5.0. You cannot
@@ -64,7 +68,7 @@
%endif
%description -n libmysqlcppconn-devel
-MySQL Connector/C++ is a MySQL database connector for C++ development. The
+MySQL Connector/C++ API is a MySQL database connector for C++ development. The
MySQL driver for C++ can be used to connect to MySQL from C++ applications. The
driver mimics the JDBC 4.0 API. It implements a significant subset of JDBC 4.0.
@@ -85,38 +89,94 @@
full functionality is not available when connecting to MySQL 5.0. You cannot
connect to MySQL 4.1 or earlier.
+%package -n libmysqlcppconn8-devel
+Summary: Development files for MySQL Connector/C++
+Group: Development/Libraries/C and C++
+Requires: %{x_libname} = %{version}
+Obsoletes: mysql-connector-c++-devel < %{version}
+Provides: mysql-connector-c++-devel = %{version}
+%if 0%{?suse_version} > 1325
+Requires: libboost_headers-devel
+%else
+Requires: boost-devel >= 1.34.0
+%endif
+
+%description -n libmysqlcppconn8-devel
+MySQL Connector/C++ 8.0 implements the X DevAPI. The X DevAPI allows one to
work
+with MySQL Servers implementing a document store via the X Plugin. One can also
+execute plain SQL queries using this API.
+
+The Driver for C++ is designed to work best with MySQL 5.1 or later. Note - its
+full functionality is not available when connecting to MySQL 5.0. You cannot
+connect to MySQL 4.1 or earlier.
+
+%package -n %{x_libname}
+Summary: MySQL Connector/C++: Standardized database driver for C++
development
+Group: Development/Libraries/C and C++
+
+%description -n %{x_libname}
+MySQL Connector/C++ 8.0 implements the X DevAPI. The X DevAPI allows one to
work
+with MySQL Servers implementing a document store via the X Plugin. One can also
+execute plain SQL queries using this API.
+
+The Driver for C++ is designed to work best with MySQL 5.1 or later. Note - its
+full functionality is not available when connecting to MySQL 5.0. You cannot
+connect to MySQL 4.1 or earlier.
+
%prep
-%setup -q -n mysql-connector-c++-%{version}
-%patch2 -p1
+%setup -q -n mysql-connector-c++-%{version}-src
%patch3 -p1
%patch4 -p1
-chmod -x examples/*
+chmod -x jdbc/examples/*
%build
%cmake \
-DMYSQLCPPCONN_GCOV_ENABLE=OFF \
-DMYSQLCPPCONN_ICU_ENABLE=OFF \
-DMYSQLCPPCONN_BUILD_EXAMPLES=OFF \
- -DCMAKE_INSTALL_LIB_DIR=%{_lib} \
-DMYSQLCLIENT_STATIC_BINDING=0 \
- -DMYSQL_CXX_LINKAGE=0
+ -DMYSQL_CXX_LINKAGE=0 \
+ -DWITH_JDBC=ON \
+ -DCMAKE_INSTALL_LIBDIR=%{_lib} \
+ -DCMAKE_INSTALL_LIBDIR:PATH=%{_lib}
make %{?_smp_mflags} VERBOSE=1
%install
%cmake_install
rm -f %{buildroot}%{_libdir}/libmysqlcppconn-static.a
rm -f %{buildroot}%{_prefix}/[A-Z]*
+mkdir -p %{buildroot}%{_docdir}/libmysqlcppconn-devel
+install -m 0644 LICENSE.txt %{buildroot}%{_docdir}/libmysqlcppconn-devel/
+install -m 0644 README.txt %{buildroot}%{_docdir}/libmysqlcppconn-devel/
+mkdir -p %{buildroot}%{_docdir}/libmysqlcppconn-devel/examples
+install -m 0644 jdbc/examples/*
%{buildroot}%{_docdir}/libmysqlcppconn-devel/examples/
+mkdir -p %{buildroot}%{_docdir}/libmysqlcppconn8-devel
+install -m 0644 LICENSE.txt %{buildroot}%{_docdir}/libmysqlcppconn8-devel/
+install -m 0644 README.txt %{buildroot}%{_docdir}/libmysqlcppconn8-devel/
%post -n %{libname} -p /sbin/ldconfig
%postun -n %{libname} -p /sbin/ldconfig
+%post -n %{x_libname} -p /sbin/ldconfig
+
+%postun -n %{x_libname} -p /sbin/ldconfig
+
%files -n libmysqlcppconn-devel
-%license COPYING
-%doc README examples
-%{_includedir}/*
-%{_libdir}/*.so
+%license LICENSE.txt
+%doc LICENSE.txt README.txt examples
+%{_includedir}/jdbc
+%{_libdir}/libmysqlcppconn.so
%files -n %{libname}
-%{_libdir}/*.so.*
+%{_libdir}/libmysqlcppconn.so.*
+
+%files -n libmysqlcppconn8-devel
+%license LICENSE.txt
+%doc LICENSE.txt README.txt
+%{_includedir}/mysqlx
+%{_libdir}/libmysqlcppconn8.so
+
+%files -n %{x_libname}
+%{_libdir}/libmysqlcppconn8.so.*
%changelog
++++++ mysql-connector-cpp-1.1.9-libmysql_dynamic_proxy_typos.patch ->
mysql-connector-cpp-8.0.12-libmysql_dynamic_proxy_typos.patch ++++++
---
/work/SRC/openSUSE:Factory/mysql-connector-cpp/mysql-connector-cpp-1.1.9-libmysql_dynamic_proxy_typos.patch
2017-11-30 12:44:05.512753338 +0100
+++
/work/SRC/openSUSE:Factory/.mysql-connector-cpp.new.28833/mysql-connector-cpp-8.0.12-libmysql_dynamic_proxy_typos.patch
2019-02-28 21:24:02.965920140 +0100
@@ -1,17 +1,15 @@
-Index: mysql-connector-c++-1.1.9/driver/nativeapi/libmysql_dynamic_proxy.cpp
-===================================================================
---- mysql-connector-c++-1.1.9.orig/driver/nativeapi/libmysql_dynamic_proxy.cpp
-+++ mysql-connector-c++-1.1.9/driver/nativeapi/libmysql_dynamic_proxy.cpp
-@@ -434,7 +434,7 @@ LibmysqlDynamicProxy::options(MYSQL * my
+---
mysql-connector-c++-8.0.12-org/jdbc/driver/nativeapi/libmysql_dynamic_proxy.cpp
2018-05-21 16:06:10.000000000 +0300
++++
mysql-connector-c++-8.0.12-src/jdbc/driver/nativeapi/libmysql_dynamic_proxy.cpp
2018-08-09 12:38:45.453558901 +0300
+@@ -440,7 +440,7 @@
int
LibmysqlDynamicProxy::get_option(MYSQL * mysql, enum mysql_option option,
const void *arg)
{
-- ptr2mysql_get_option ptr2_get_option =
symbol_safe_cast<ptr2mysql_options4>(GetProcAddr("mysql_get_option"));
-+ ptr2mysql_get_option ptr2_get_option =
symbol_safe_cast<ptr2mysql_get_option>(GetProcAddr("mysql_get_option"));
- if (ptr2_get_option != NULL) {
- if (((*ptr2_get_option)(mysql, option, arg))) {
- throw sql::InvalidArgumentException("Unsupported option
provided to mysql_get_option()");
-@@ -813,7 +813,7 @@ LibmysqlDynamicProxy::stmt_free_result(M
+- ptr2mysql_get_option ptr2_get_option =
symbol_safe_cast<ptr2mysql_options4>(GetProcAddr("mysql_get_option"));
++ ptr2mysql_get_option ptr2_get_option =
symbol_safe_cast<ptr2mysql_get_option>(GetProcAddr("mysql_get_option"));
+ if (ptr2_get_option != NULL) {
+ if (((*ptr2_get_option)(mysql, option, arg))) {
+ throw sql::InvalidArgumentException("Unsupported option provided to
mysql_get_option()");
+@@ -819,7 +819,7 @@
{
ptr2mysql_stmt_free_result ptr2_stmt_free_result =
symbol_safe_cast<ptr2mysql_stmt_free_result>(GetProcAddr("mysql_stmt_free_result"));
++++++ mysql-connector-cpp-mariadb.patch ++++++
--- /var/tmp/diff_new_pack.c3Lkel/_old 2019-02-28 21:24:03.573919937 +0100
+++ /var/tmp/diff_new_pack.c3Lkel/_new 2019-02-28 21:24:03.577919936 +0100
@@ -1,45 +1,190 @@
-diff -uNr mysql-connector-c++-1.1.9.org/driver/mysql_connection.cpp
mysql-connector-c++-1.1.9/driver/mysql_connection.cpp
---- mysql-connector-c++-1.1.9.org/driver/mysql_connection.cpp 2017-05-10
19:14:59.000000000 +0300
-+++ mysql-connector-c++-1.1.9/driver/mysql_connection.cpp 2018-02-05
11:50:27.376483448 +0200
-@@ -231,7 +231,7 @@
- {"OPT_REPORT_DATA_TRUNCATION", MYSQL_REPORT_DATA_TRUNCATION, false},
- {"OPT_ENABLE_CLEARTEXT_PLUGIN", MYSQL_ENABLE_CLEARTEXT_PLUGIN, false},
- {"sslVerify", MYSQL_OPT_SSL_VERIFY_SERVER_CERT, false},
// Deprecated
-- {"OPT_CAN_HANDLE_EXPIRED_PASSWORDS",
MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS, true},
-+// {"OPT_CAN_HANDLE_EXPIRED_PASSWORDS",
MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS, true},
+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 @@
+
+ #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
+@@ -240,7 +240,7 @@
+ {"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},
+-#if MYCPPCONN_STATIC_MYSQL_VERSION_ID < 80000
++#if MYCPPCONN_STATIC_MYSQL_VERSION_ID < 80000 ||
defined(MYCPPCONN_MARIADB_BUILD)
+ {"sslVerify", MYSQL_OPT_SSL_VERIFY_SERVER_CERT, false},
// Deprecated
{"sslEnforce", MYSQL_OPT_SSL_ENFORCE, false} //
Deprecated
-@@ -246,7 +246,8 @@
- {"OPT_LOCAL_INFILE", MYSQL_OPT_LOCAL_INFILE, false},
+ #else
+@@ -262,8 +262,8 @@
{"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_ENFORCE", MYSQL_OPT_SSL_ENFORCE, false},
-+// {"OPT_SSL_MODE", MYSQL_OPT_SSL_MODE , false},
-
- };
- /* Array for mapping of string connection options to mysql_options call */
-@@ -268,7 +269,7 @@
- {"readDefaultGroup", MYSQL_READ_DEFAULT_GROUP, false},
- {"readDefaultFile", MYSQL_READ_DEFAULT_FILE, false},
- {"OPT_CHARSET_NAME", MYSQL_SET_CHARSET_NAME, true},
-- {"OPT_TLS_VERSION", MYSQL_OPT_TLS_VERSION, false},
-+// {"OPT_TLS_VERSION", MYSQL_OPT_TLS_VERSION, false},
+-#if MYCPPCONN_STATIC_MYSQL_VERSION_ID >= 80000
++ //{"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
};
+@@ -769,7 +769,7 @@
+ } else if (!it->first.compare("OPT_CONNECT_ATTR_RESET")) {
+ proxy->options(MYSQL_OPT_CONNECT_ATTR_RESET, 0);
- template<class T>
-diff -uNr mysql-connector-c++-1.1.9.org/driver/mysql_connection_options.h
mysql-connector-c++-1.1.9/driver/mysql_connection_options.h
---- mysql-connector-c++-1.1.9.org/driver/mysql_connection_options.h
2017-05-10 19:14:59.000000000 +0300
-+++ mysql-connector-c++-1.1.9/driver/mysql_connection_options.h
2018-02-05 12:38:10.760832179 +0200
-@@ -55,8 +55,8 @@
- MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS,
+-#if MYCPPCONN_STATIC_MYSQL_VERSION_ID > 80000
++#if MYCPPCONN_STATIC_MYSQL_VERSION_ID > 80000 &&
!defined(MYCPPCONN_MARIADB_BUILD)
+
+ } else if (!it->first.compare("sslVerify")) {
+
+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 @@
+
+ enum MySQL_Connection_Options
+ {
+-#if MYCPPCONN_STATIC_MYSQL_VERSION_ID >= 80000
++#if MYCPPCONN_STATIC_MYSQL_VERSION_ID >= 80000 &&
!defined(MYCPPCONN_MARIADB_BUILD)
+ 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 @@
MYSQL_OPT_SSL_ENFORCE,
+ #if MYCPPCONN_STATIC_MYSQL_VERSION_ID >= 50700
MYSQL_OPT_MAX_ALLOWED_PACKET, MYSQL_OPT_NET_BUFFER_LENGTH,
- MYSQL_OPT_TLS_VERSION,
- MYSQL_OPT_SSL_MODE
-+ //MYSQL_OPT_TLS_VERSION,
-+ //MYSQL_OPT_SSL_MODE
- };
++ MYSQL_OPT_TLS_VERSION
++// MYSQL_OPT_SSL_MODE
+ #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
+@@ -38,7 +38,7 @@
+ #include <cppconn/resultset_metadata.h>
+ #include <cppconn/version_info.h>
+
+-#if (MYCPPCONN_STATIC_MYSQL_VERSION_ID > 80004)
++#if (MYCPPCONN_STATIC_MYSQL_VERSION_ID > 80004 &&
!defined(MYCPPCONN_MARIADB_BUILD))
+ 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 @@
+ LibmysqlStaticProxy::get_option(MYSQL * mysql, enum mysql_option option,
const void *arg)
+ {
+ #if MYSQL_VERSION_ID >= 50703
+- if (::mysql_get_option(mysql, option, arg)) {
++ if (::mysql_get_option(mysql, option, const_cast<void*>(arg))) {
+ 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 @@
+ 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;
+- case sql::mysql::MYSQL_OPT_SSL_MODE: return ::MYSQL_OPT_SSL_MODE;
++ //case sql::mysql::MYSQL_OPT_SSL_MODE: return ::MYSQL_OPT_SSL_MODE;
+ #endif
+
+
+-#if MYCPPCONN_STATIC_MYSQL_VERSION_ID >= 80000
++#if MYCPPCONN_STATIC_MYSQL_VERSION_ID >= 80000 &&
!defined(MYCPPCONN_MARIADB_BUILD)
+ 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 @@
+ boost::shared_ptr< IMySQLCAPI > api;
+
+
+-#if (MYCPPCONN_STATIC_MYSQL_VERSION_ID > 80004)
++#if (MYCPPCONN_STATIC_MYSQL_VERSION_ID > 80004 &&
!defined(MYCPPCONN_MARIADB_BUILD))
+ 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
+@@ -38,7 +38,7 @@
+ #include "native_resultset_wrapper.h"
+ #include "../cppconn/version_info.h"
+
+-#if (MYCPPCONN_STATIC_MYSQL_VERSION_ID > 80004)
++#if (MYCPPCONN_STATIC_MYSQL_VERSION_ID > 80004 &&
!defined(MYCPPCONN_MARIADB_BUILD))
+ struct MYSQL_RES;
+ #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
+@@ -38,7 +38,7 @@
+
+ #include "native_statement_wrapper.h"
+
+-#if (MYCPPCONN_STATIC_MYSQL_VERSION_ID > 80004)
++#if (MYCPPCONN_STATIC_MYSQL_VERSION_ID > 80004 &&
!defined(MYCPPCONN_MARIADB_BUILD))
+ struct MYSQL_STMT;
+ #else
+ struct st_mysql_stmt;
+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
+@@ -41,7 +41,7 @@
+
+ #include "../cppconn/version_info.h"
+
+-#if (MYCPPCONN_STATIC_MYSQL_VERSION_ID > 80004)
++#if (MYCPPCONN_STATIC_MYSQL_VERSION_ID > 80004 &&
!defined(MYCPPCONN_MARIADB_BUILD))
+ 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
+@@ -42,7 +42,7 @@
+ #include "../mysql_statement_options.h"
+ #include "../cppconn/version_info.h"
+
+-#if (MYCPPCONN_STATIC_MYSQL_VERSION_ID > 80004)
++#if (MYCPPCONN_STATIC_MYSQL_VERSION_ID > 80004 &&
!defined(MYCPPCONN_MARIADB_BUILD))
+ 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 @@
+ "\"${MYSQL_CONFIG_EXECUTABLE}\"")
+ endif()
+
++ list(GET MYSQL_INCLUDE_DIR 0 MYSQL_INCLUDE_DIR)
++
+ if(NOT EXISTS "${MYSQL_INCLUDE_DIR}/mysql.h")
+ message(FATAL_ERROR "Could not find \"mysql.h\" in
\"${MYSQL_INCLUDE_DIR}\" "
+ "found from running \"${MYSQL_CONFIG_EXECUTABLE}\"")
+diff -uNr mysql-connector-c++-8.0.15-org/jdbc.cmake
mysql-connector-c++-8.0.15-src/jdbc.cmake
+--- mysql-connector-c++-8.0.15-org/jdbc.cmake 2019-01-28 09:12:59.000000000
+0200
++++ mysql-connector-c++-8.0.15-src/jdbc.cmake 2019-02-16 12:26:42.480429868
+0200
+@@ -66,7 +66,7 @@
+ list(APPEND jdbc_cmake_opts
-DMYSQL_CONFIG_EXECUTABLE=${MYSQL_CONFIG_EXECUTABLE})
+ endif()
+
+-list(APPEND jdbc_cmake_opts -DMYSQLCLIENT_STATIC_LINKING=ON)
++#list(APPEND jdbc_cmake_opts -DMYSQLCLIENT_STATIC_LINKING=ON)
- }
+ if(CMAKE_BUILD_TYPE)
+ if(CMAKE_BUILD_TYPE MATCHES "[Ss][Tt][Aa][Tt][Ii][Cc]")
