summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorKonstantin Osipov <kostja@sun.com>2010-02-02 16:58:15 +0300
committerKonstantin Osipov <kostja@sun.com>2010-02-02 16:58:15 +0300
commitc2fe19883e624ddd0e37768f860fa0853848adb3 (patch)
tree0aec0b83266060d9cc4c9c65ee047b5fd7a83d96 /tests
parent3147bdd0ac34a5c62158b8c28da6ca77e0901f08 (diff)
parentece5ad57e9b2505732be4b043440d9e5a5dc3b9a (diff)
downloadmariadb-git-c2fe19883e624ddd0e37768f860fa0853848adb3.tar.gz
Merge next-mr -> next-4284.
Fix Bug#50555 "handler commands crash server in my_hash_first()" as a post-merge fix (the new handler tests are not passing otherwise). - in hash.c, don't call calc_hash if ! my_hash_inited(). - add tests and results for the test case for Bug#50555
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 1b580f2412b..c44ff0b00c7 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 },