diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2009-12-16 13:44:56 +0100 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2009-12-16 13:44:56 +0100 |
| commit | 7b08032bfc7a181c59d2a3b1110ce9407b560c00 (patch) | |
| tree | 77b1f55fbec6a9d804aaec7933a1558a0e52d954 /mysqlcppconn | |
| parent | 1523eb9c6de6affffd34a919702f0a88d9ef745a (diff) | |
mysqlconnector: #i107391# default the protocol to TCP when talking with C/C
Diffstat (limited to 'mysqlcppconn')
| -rw-r--r-- | mysqlcppconn/makefile.mk | 4 | ||||
| -rw-r--r-- | mysqlcppconn/patches/default_to_protocol_tcp.patch | 12 |
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; |