summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2010-01-12 19:48:28 +0300
committerAlexander Nozdrin <alik@sun.com>2010-01-12 19:48:28 +0300
commit50561ab0108dcb427ba0975f11dcab3e20b05612 (patch)
treeca3dea603f46cd94f405d708d0fc1037644946b9
parent51caeae915d3a5add57a785e69b7ce52cac084ad (diff)
downloadmariadb-git-50561ab0108dcb427ba0975f11dcab3e20b05612.tar.gz
Enable WL#4435.
-rw-r--r--libmysql/client_settings.h3
-rw-r--r--tests/mysql_client_test.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/libmysql/client_settings.h b/libmysql/client_settings.h
index fa92dfb2687..aaec08d1b1e 100644
--- a/libmysql/client_settings.h
+++ b/libmysql/client_settings.h
@@ -27,7 +27,8 @@ extern char * mysql_unix_port;
CLIENT_TRANSACTIONS | \
CLIENT_PROTOCOL_41 | \
CLIENT_SECURE_CONNECTION | \
- CLIENT_MULTI_RESULTS)
+ CLIENT_MULTI_RESULTS | \
+ CLIENT_PS_MULTI_RESULTS)
sig_handler my_pipe_sig_handler(int sig);
void read_user_name(char *name);
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c
index 1b7fc76c300..e9c70257e01 100644
--- a/tests/mysql_client_test.c
+++ b/tests/mysql_client_test.c
@@ -19197,7 +19197,7 @@ static struct my_tests_st my_tests[]= {
{ "test_wl4166_3", test_wl4166_3 },
{ "test_wl4166_4", test_wl4166_4 },
{ "test_bug36004", test_bug36004 },
-/* { "test_wl4435", test_wl4435 }, */
+ { "test_wl4435", test_wl4435 },
{ "test_wl4435_2", test_wl4435_2 },
{ "test_bug38486", test_bug38486 },
{ "test_bug33831", test_bug33831 },