Hello community,
here is the log from the commit of package mysql-connector-cpp for
openSUSE:Factory checked in at 2017-11-30 12:44:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mysql-connector-cpp (Old)
and /work/SRC/openSUSE:Factory/.mysql-connector-cpp.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mysql-connector-cpp"
Thu Nov 30 12:44:04 2017 rev:24 rq:545192 version:1.1.9
Changes:
--------
--- /work/SRC/openSUSE:Factory/mysql-connector-cpp/mysql-connector-cpp.changes
2017-09-25 13:52:05.480671803 +0200
+++
/work/SRC/openSUSE:Factory/.mysql-connector-cpp.new/mysql-connector-cpp.changes
2017-11-30 12:44:05.612749703 +0100
@@ -1,0 +2,14 @@
+Fri Nov 24 12:20:13 UTC 2017 - [email protected]
+
+- add mysql-connector-cpp-1.1.9-libmysql_dynamic_proxy_typos.patch
+ to fix build by fixing copypaste errors in
+ libmysql_dynamic_proxy.cpp file [bsc#1067883]
+- remove mariadb_api.patch that it's no longer needed because:
+ * our current client library already provides mysql_get_option()
+ * using MARIADB_BASE_VERSION is no longer working as intended as
+ it's not defined in mariadb client library provided by
+ mariadb-connector-c
+ * hunk for stmt_free_result() was moved to
+ mysql-connector-cpp-1.1.9-libmysql_dynamic_proxy_typos.patch
+
+-------------------------------------------------------------------
Old:
----
mariadb_api.patch
New:
----
mysql-connector-cpp-1.1.9-libmysql_dynamic_proxy_typos.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mysql-connector-cpp.spec ++++++
--- /var/tmp/diff_new_pack.i3iVvx/_old 2017-11-30 12:44:06.452719166 +0100
+++ /var/tmp/diff_new_pack.i3iVvx/_new 2017-11-30 12:44:06.456719021 +0100
@@ -25,10 +25,10 @@
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-FIX-UPSTREAM: work with mariadb versions properly too
-Patch0: mariadb_api.patch
# 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
+# 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
%if 0%{?suse_version} > 1325
BuildRequires: libboost_headers-devel
%else
@@ -86,8 +86,8 @@
%prep
%setup -q -n mysql-connector-c++-%{version}
-%patch0 -p1
%patch2 -p1
+%patch3 -p1
chmod -x examples/*
%build
++++++ mysql-connector-cpp-1.1.9-libmysql_dynamic_proxy_typos.patch ++++++
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
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_stmt_free_result ptr2_stmt_free_result =
symbol_safe_cast<ptr2mysql_stmt_free_result>(GetProcAddr("mysql_stmt_free_result"));
- return (*ptr2_stmt_next_result)(stmt);
+ return (*ptr2_stmt_free_result)(stmt);
}
/* }}} */
