diff options
| author | MySQL Build Team <build@mysql.com> | 2009-11-17 17:05:36 +0100 |
|---|---|---|
| committer | MySQL Build Team <build@mysql.com> | 2009-11-17 17:05:36 +0100 |
| commit | 41f7c2be26117ac8b6c88386cb12e9d6831511b4 (patch) | |
| tree | e80e31c3eef5720bc7c759753ba497a1b9163042 | |
| parent | ac0654166f48d834afb8011457e575c557ec3a0f (diff) | |
| download | mariadb-git-41f7c2be26117ac8b6c88386cb12e9d6831511b4.tar.gz | |
Disable WL#4435.
Patch done by Alik, received for the 5.5.0-beta release build in mail.
| -rw-r--r-- | libmysql/client_settings.h | 3 | ||||
| -rw-r--r-- | 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 }, |