Hello community,
here is the log from the commit of package mysql-connector-cpp for
openSUSE:Factory checked in at 2018-02-07 18:37:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mysql-connector-cpp (Old)
and /work/SRC/openSUSE:Factory/.mysql-connector-cpp.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mysql-connector-cpp"
Wed Feb 7 18:37:51 2018 rev:25 rq:573119 version:1.1.9
Changes:
--------
--- /work/SRC/openSUSE:Factory/mysql-connector-cpp/mysql-connector-cpp.changes
2017-11-30 12:44:05.612749703 +0100
+++
/work/SRC/openSUSE:Factory/.mysql-connector-cpp.new/mysql-connector-cpp.changes
2018-02-07 18:37:52.402132224 +0100
@@ -1,0 +2,6 @@
+Mon Feb 5 14:15:08 UTC 2018 - [email protected]
+
+- add mysql-connector-cpp-mariadb.patch
+ to fix compatibility with MariaDB, not supported options removed
+
+-------------------------------------------------------------------
New:
----
mysql-connector-cpp-mariadb.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mysql-connector-cpp.spec ++++++
--- /var/tmp/diff_new_pack.pF2RJQ/_old 2018-02-07 18:37:53.038102431 +0100
+++ /var/tmp/diff_new_pack.pF2RJQ/_new 2018-02-07 18:37:53.038102431 +0100
@@ -1,7 +1,7 @@
#
# spec file for package mysql-connector-cpp
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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
@@ -29,6 +29,7 @@
Patch2: mysql-connector-cpp-1.1.0-disable_tests_and_examples.patch
# 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
+Patch4: mysql-connector-cpp-mariadb.patch
%if 0%{?suse_version} > 1325
BuildRequires: libboost_headers-devel
%else
@@ -88,6 +89,7 @@
%setup -q -n mysql-connector-c++-%{version}
%patch2 -p1
%patch3 -p1
+%patch4 -p1
chmod -x examples/*
%build
++++++ mysql-connector-cpp-mariadb.patch ++++++
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},
{"OPT_CONNECT_ATTR_RESET", MYSQL_OPT_CONNECT_ATTR_RESET, true},
{"OPT_RECONNECT", MYSQL_OPT_RECONNECT, true},
{"sslEnforce", MYSQL_OPT_SSL_ENFORCE, false} // Deprecated
@@ -246,7 +246,8 @@
{"OPT_LOCAL_INFILE", MYSQL_OPT_LOCAL_INFILE, false},
{"OPT_MAX_ALLOWED_PACKET", MYSQL_OPT_MAX_ALLOWED_PACKET, false},
{"OPT_NET_BUFFER_LENGTH", MYSQL_OPT_NET_BUFFER_LENGTH, false},
- {"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},
};
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,
MYSQL_OPT_SSL_ENFORCE,
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
};
}
