From 04bf4eeea9fa387722b7bf95ffdd6957791b4241 Mon Sep 17 00:00:00 2001
From: MySQL Build Team <build@mysql.com>
Date: Tue, 17 Nov 2009 17:05:36 +0100
Subject: [PATCH] Disable WL#4435.

Patch done by Alik, received for the 5.5.0-beta release build in mail.
---
 libmysql/client_settings.h | 3 +--
 tests/mysql_client_test.c  | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/libmysql/client_settings.h b/libmysql/client_settings.h
index aaec08d1b1e..fa92dfb2687 100644
--- a/libmysql/client_settings.h
+++ b/libmysql/client_settings.h
@@ -27,8 +27,7 @@ extern char *	mysql_unix_port;
                              CLIENT_TRANSACTIONS |  \
                              CLIENT_PROTOCOL_41 | \
                              CLIENT_SECURE_CONNECTION | \
-                             CLIENT_MULTI_RESULTS | \
-                             CLIENT_PS_MULTI_RESULTS)
+                             CLIENT_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 cfe401c75f3..aea0f1f6b11 100644
--- a/tests/mysql_client_test.c
+++ b/tests/mysql_client_test.c
@@ -19154,7 +19154,7 @@ static struct my_tests_st my_tests[]= {
   { "test_wl4166_2", test_wl4166_2 },
   { "test_wl4166_3", test_wl4166_3 },
   { "test_wl4166_4", test_wl4166_4 },
-  { "test_wl4435",   test_wl4435 },
+/*   { "test_wl4435",   test_wl4435 }, */
   { "test_wl4435_2", test_wl4435_2 },
   { "test_bug38486", test_bug38486 },
   { "test_bug33831", test_bug33831 },