update mysqlcppconn to latest version

Change-Id: I2e60d97b777727878daf811c2f3da697af69c484

4 files changed, 9 insertions, 14 deletions

diff --git a/download.lst b/download.lst
index 1708e1a9b188..ac0682c1b1a7 100644
--- a/download.lst
+++ b/download.lst
@@ -100,7 +100,7 @@ export MSPUB_MD5SUM := 1d489c4932109e72495b1df8b69e5f11
 export MSPUB_TARBALL := libmspub-0.1.1.tar.bz2
 export MWAW_MD5SUM := 6f1ac4a0e24131c422e1e91f07718fb6
 export MWAW_TARBALL := libmwaw-0.3.1.tar.bz2
-export MYSQLCPPCONN_TARBALL := 0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz
+export MYSQLCPPCONN_TARBALL := 7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz
 export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
 export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz
 export NSS_TARBALL := 06beb053e257d9e22641339c905c6eba-nss-3.15.3-with-nspr-4.10.2.tar.gz
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;