mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for CONC-104: mysql_options doesn't support MYSQL_SECURE_AUTH option

Browse Source 
http://bazaar.launchpad.net/~maria-captains/mariadb-native-client/trunk/revision/149

Change-Id: I273f355b9fc922fdb9d9692e0057cfccfdcbcde1
Reviewed-on: https://gerrit.libreoffice.org/11492
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Robert Antoni Buj i Gelonch
2014-09-17 18:05:43 +02:00
committed by Caolán McNamara
parent 81055f589f
commit 5c6d26753d
5 changed files with 80 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
external/mysqlcppconn/patches/enable-libmysql-proxy.patch vendored Normal file
View File

@@ -0,0 +1,27 @@
--- UnpackedTarball/mysqlcppconn/driver/nativeapi/mysql_client_api.cpp 2014-07-30 13:41:37.000000000 +0200
+++ UnpackedTarball/mysqlcppconn/driver/nativeapi/mysql_client_api.cpp 2014-09-17 22:12:26.000000000 +0200
@@ -32,10 +32,10 @@
#ifdef MYSQLCLIENT_STATIC_BINDING
/* MySQL client library is linked */
-# include "libmysql_static_proxy.h"
+ #include "libmysql_static_proxy.h"
#else
/* MySQL client library will be dynamically loaded */
-# include "libmysql_dynamic_proxy.h"
+ #include "libmysql_dynamic_proxy.h"
#endif
namespace sql
@@ -76,9 +76,9 @@
#include "binding_config.h"
#ifdef MYSQLCLIENT_STATIC_BINDING
-# include "libmysql_static_proxy.cpp"
+ #include "libmysql_static_proxy.cpp"
#else
-# include "libmysql_dynamic_proxy.cpp"
+ #include "libmysql_dynamic_proxy.cpp"
#endif
/*