summaryrefslogtreecommitdiff
path: root/mysqlcppconn
diff options
context:
space:
mode:
authorLionel Elie Mamane <lionel@mamane.lu>2013-03-14 22:10:10 +0100
committerLionel Elie Mamane <lionel@mamane.lu>2013-03-14 22:11:33 +0100
commitdd4aa4debbb556117c9b9b9c755a9d9164d8dc25 (patch)
treea07ae487322f76805b0240724d1278b9f998dd13 /mysqlcppconn
parent4dfbd5d06f80813688af46a5c10ea641e320fc2b (diff)
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
Diffstat (limited to 'mysqlcppconn')
-rw-r--r--mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch30
1 files changed, 0 insertions, 30 deletions
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);
- }
- /* }}} */
-