diff options
| author | Lionel Elie Mamane <lionel@mamane.lu> | 2014-08-11 15:46:24 +0200 |
|---|---|---|
| committer | Lionel Elie Mamane <lionel@mamane.lu> | 2014-08-11 15:48:00 +0200 |
| commit | d9c2eb046c7827d7c1fcf78593a5b450d5ee68ab (patch) | |
| tree | e243b1bfaf72f704f96578d549c8159e32274f6a /external | |
| parent | 311fb9d5e61fa3cab40b85434e22d288c974939b (diff) | |
update mysqlcppconn to latest version
Change-Id: I2e60d97b777727878daf811c2f3da697af69c484
Diffstat (limited to 'external')
| -rw-r--r-- | external/mysqlcppconn/Library_mysqlcppconn.mk | 8 | ||||
| -rw-r--r-- | external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk | 1 | ||||
| -rw-r--r-- | external/mysqlcppconn/patches/default_to_protocol_tcp.patch | 12 |
3 files changed, 8 insertions, 13 deletions
diff --git a/external/mysqlcppconn/Library_mysqlcppconn.mk b/external/mysqlcppconn/Library_mysqlcppconn.mk index eccc52173d8e..0bc28b671ab5 100644 --- a/external/mysqlcppconn/Library_mysqlcppconn.mk +++ b/external/mysqlcppconn/Library_mysqlcppconn.mk @@ -63,6 +63,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,mysqlcppconn,\ UnpackedTarball/mysqlcppconn/driver/mysql_resultset \ UnpackedTarball/mysqlcppconn/driver/mysql_resultset_metadata \ UnpackedTarball/mysqlcppconn/driver/mysql_statement \ + UnpackedTarball/mysqlcppconn/driver/mysql_uri \ UnpackedTarball/mysqlcppconn/driver/mysql_util \ UnpackedTarball/mysqlcppconn/driver/mysql_warning \ UnpackedTarball/mysqlcppconn/driver/nativeapi/mysql_client_api \ @@ -73,4 +74,11 @@ $(eval $(call gb_Library_add_generated_exception_objects,mysqlcppconn,\ UnpackedTarball/mysqlcppconn/driver/nativeapi/mysql_native_statement_wrapper \ )) +$(WORKDIR)/GenCxxObject/UnpackedTarball/mysqlcppconn/driver/mysql_metadata.o $(WORKDIR)/GenCxxObject/UnpackedTarball/mysqlcppconn/driver/mysql_driver.o: mysqlcppconn_configure + +mysqlcppconn_configure: $(call gb_UnpackedTarball_get_target,mysqlcppconn) + cd ../../workdir/GenCxxObject/UnpackedTarball/mysqlcppconn && cmake ../../../UnpackedTarball/mysqlcppconn/ + +.PHONY: mysqlcppconn_configure + # vim: set noet sw=4 ts=4: diff --git a/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk b/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk index 9c2282e52117..74f19ac178f0 100644 --- a/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk +++ b/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk @@ -17,7 +17,6 @@ $(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/default_to_protocol_tcp.patch \ external/mysqlcppconn/patches/warnings.patch.0 \ )) diff --git a/external/mysqlcppconn/patches/default_to_protocol_tcp.patch b/external/mysqlcppconn/patches/default_to_protocol_tcp.patch deleted file mode 100644 index 320d699ed697..000000000000 --- a/external/mysqlcppconn/patches/default_to_protocol_tcp.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- misc/mysql-connector-c++-1.1.0/driver/mysql_connection.cpp 2009-12-16 13:24:24.088933245 +0100 -+++ misc/build/mysql-connector-c++-1.1.0/driver/mysql_connection.cpp 2009-12-16 13:24:15.666841004 +0100 -@@ -437,6 +437,9 @@ - } - } - -+ int default_protocol_tcp = MYSQL_PROTOCOL_TCP; -+ proxy->options(MYSQL_OPT_PROTOCOL, (const char *) &default_protocol_tcp); -+ - #ifndef _WIN32 - if (!hostName.compare(0, sizeof("unix://") - 1, "unix://")) { - protocol_tcp = false; |