diff options
| author | Robert Antoni Buj i Gelonch <robert.buj@gmail.com> | 2014-09-17 18:05:43 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-09-25 16:14:27 +0000 |
| commit | 5c6d26753d758c2173f21a14283bdafa54063b63 (patch) | |
| tree | ae111e7e4b8df854baa55e418813abf65067fb37 /external/mysqlcppconn | |
| parent | 81055f589fc2de92e37dbe29f59b5da80728b28a (diff) | |
Fix for CONC-104: mysql_options doesn't support MYSQL_SECURE_AUTH option
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>
Diffstat (limited to 'external/mysqlcppconn')
| -rw-r--r-- | external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk | 1 | ||||
| -rw-r--r-- | external/mysqlcppconn/patches/enable-libmysql-proxy.patch | 27 |
2 files changed, 28 insertions, 0 deletions
diff --git a/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk b/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk index 9647c383775a..65f0f8300d1e 100644 --- a/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk +++ b/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk @@ -19,6 +19,7 @@ $(eval $(call gb_UnpackedTarball_add_file,mysqlcppconn,driver/nativeapi/binding_ $(eval $(call gb_UnpackedTarball_add_patches,mysqlcppconn,\ external/mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch \ external/mysqlcppconn/patches/warnings.patch.0 \ + external/mysqlcppconn/patches/enable-libmysql-proxy.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/external/mysqlcppconn/patches/enable-libmysql-proxy.patch b/external/mysqlcppconn/patches/enable-libmysql-proxy.patch new file mode 100644 index 000000000000..6a5894cb1e9c --- /dev/null +++ b/external/mysqlcppconn/patches/enable-libmysql-proxy.patch @@ -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 + + /* |