summaryrefslogtreecommitdiff
path: root/mysqlcppconn
diff options
context:
space:
mode:
Diffstat (limited to 'mysqlcppconn')
-rw-r--r--mysqlcppconn/makefile.mk4
-rw-r--r--mysqlcppconn/patches/default_to_protocol_tcp.patch12
2 files changed, 15 insertions, 1 deletions
diff --git a/mysqlcppconn/makefile.mk b/mysqlcppconn/makefile.mk
index 191bae226c4c..b8ae91492e2e 100644
--- a/mysqlcppconn/makefile.mk
+++ b/mysqlcppconn/makefile.mk
@@ -52,7 +52,9 @@ ADDITIONAL_FILES=\
CONVERTFILES=\
cppconn$/build_config.h
-PATCH_FILES=$(TARFILE_NAME).patch
+PATCH_FILES=\
+ $(TARFILE_NAME).patch \
+ patches/default_to_protocol_tcp.patch
BUILD_DIR=driver
BUILD_ACTION = \
diff --git a/mysqlcppconn/patches/default_to_protocol_tcp.patch b/mysqlcppconn/patches/default_to_protocol_tcp.patch
new file mode 100644
index 000000000000..3df78f40f5b7
--- /dev/null
+++ b/mysqlcppconn/patches/default_to_protocol_tcp.patch
@@ -0,0 +1,12 @@
+--- misc/mysql-connector-cpp/driver/mysql_connection.cpp 2009-12-16 13:24:24.088933245 +0100
++++ misc/build/mysql-connector-cpp/driver/mysql_connection.cpp 2009-12-16 13:24:15.666841004 +0100
+@@ -437,6 +437,9 @@
+ throw sql::InvalidArgumentException(e.what());
+ }
+
++ 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;