summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJoerg Bruehe <joerg@mysql.com>2009-12-16 16:20:08 +0100
committerJoerg Bruehe <joerg@mysql.com>2009-12-16 16:20:08 +0100
commit9018db2c7a2aa256a3ba38175bf37eec4688d61c (patch)
tree44687e1e015ccde9dacb1bac98d643d5c786a7e3 /tests
parent5cd3dffebb2abd5778e819ac57001e0d963484d8 (diff)
parent6ddab77da26d4529db403e573298f927d315adeb (diff)
downloadmariadb-git-9018db2c7a2aa256a3ba38175bf37eec4688d61c.tar.gz
Automerge the changes of version 5.5.0-m2.
Diffstat (limited to 'tests')
-rw-r--r--tests/mysql_client_test.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c
index 94f3ab210d6..007522589e1 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 },