summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorKonstantin Osipov <kostja@sun.com>2010-02-04 00:48:40 +0300
committerKonstantin Osipov <kostja@sun.com>2010-02-04 00:48:40 +0300
commitf30d17e078dab10c8beded9a1c9b476dd4c67be9 (patch)
tree737674a83beb16e444848c8c4a66a3de08696065 /tests
parent1397985d53b575ed51b51568a12695949ab00698 (diff)
parentb6685d35dcc45e4fc8eca53fa8f6d3315f2e6b89 (diff)
downloadmariadb-git-f30d17e078dab10c8beded9a1c9b476dd4c67be9.tar.gz
Merge next-mr -> next-4284.
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 01b994b11ee..1fa7f930ab8 100644
--- a/tests/mysql_client_test.c
+++ b/tests/mysql_client_test.c
@@ -19362,7 +19362,7 @@ static struct my_tests_st my_tests[]= {
{ "test_wl4166_4", test_wl4166_4 },
{ "test_bug36004", test_bug36004 },
{ "test_wl4284_1", test_wl4284_1 },
-/* { "test_wl4435", test_wl4435 }, */
+ { "test_wl4435", test_wl4435 },
{ "test_wl4435_2", test_wl4435_2 },
{ "test_bug38486", test_bug38486 },
{ "test_bug33831", test_bug33831 },