From dd4aa4debbb556117c9b9b9c755a9d9164d8dc25 Mon Sep 17 00:00:00 2001 From: Lionel Elie Mamane Date: Thu, 14 Mar 2013 22:10:10 +0100 Subject: update to newer libmariadb Updated to bzr/launchpad snapshot revision 40 Solves: - missing symbols mysql_library_init and mysql_library_end - missing parameter "cipher" to mysql_ssl_set Change-Id: I0266fbfa0fca89eb665cf6320afa5fb0dbfd7c84 --- .../patches/mysql-connector-c++-1.1.0.patch | 30 ---------------------- 1 file changed, 30 deletions(-) (limited to 'mysqlcppconn') diff --git a/mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch b/mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch index 8ddbd74c98f3..c7fd21b58ba5 100644 --- a/mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch +++ b/mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch @@ -115,33 +115,3 @@ namespace sql { ---- misc/mysql-connector-c++-1.1.0/driver/nativeapi/libmysql_static_proxy.cpp 2010-09-10 11:47:47.000000000 +0200 -+++ misc/build/mysql-connector-c++-1.1.0/driver/nativeapi/libmysql_static_proxy.cpp 2013-03-14 11:10:14.850848088 +0100 -@@ -213,7 +213,8 @@ - int - LibmysqlStaticProxy::library_init(int argc,char **argv,char **groups) - { -- return ::mysql_library_init(argc, argv, groups); -+// return ::mysql_library_init(argc, argv, groups); -+ return 0; - } - /* }}} */ - -@@ -222,7 +223,7 @@ - void - LibmysqlStaticProxy::library_end() - { -- return ::mysql_library_end(); -+// return ::mysql_library_end(); - } - /* }}} */ - -@@ -352,7 +353,7 @@ - const char * capath, - const char * cipher) - { -- return ::mysql_ssl_set(mysql, key, cert, ca, capath, cipher); -+ return ::mysql_ssl_set(mysql, key, cert, ca, capath); - } - /* }}} */ - -- cgit