diff options
author | unknown <anozdrin/alik@quad.> | 2008-03-12 15:52:38 +0300 |
---|---|---|
committer | unknown <anozdrin/alik@quad.> | 2008-03-12 15:52:38 +0300 |
commit | 418f328ea32d8867b20c6c62e2f83796a6e4ae1d (patch) | |
tree | c6c8ab5c590dd5d07f070f0f69c3753fa64da72d /tests | |
parent | 26e230b4a7e8f22818db977f29245f62ecee79fc (diff) | |
parent | 6834e608d238371a5232741f3f9e32e8c1ec3b68 (diff) | |
download | mariadb-git-418f328ea32d8867b20c6c62e2f83796a6e4ae1d.tar.gz |
Merge quad.:/mnt/raid/alik/MySQL/devel/5.0-rt
into quad.:/mnt/raid/alik/MySQL/devel/5.1-rt
tests/mysql_client_test.c:
Manually merged.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/mysql_client_test.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c index d86de9a4179..482ae37d15b 100644 --- a/tests/mysql_client_test.c +++ b/tests/mysql_client_test.c @@ -16600,6 +16600,8 @@ static void test_bug27592() DBUG_VOID_RETURN; } +#if 0 + static void test_bug29948() { MYSQL *dbc=NULL; @@ -16673,6 +16675,7 @@ static void test_bug29948() mysql_close(dbc); } +#endif /* Bug#29687 mysql_stmt_store_result memory leak in libmysqld @@ -17712,7 +17715,7 @@ static struct my_tests_st my_tests[]= { { "test_bug28505", test_bug28505 }, { "test_bug28934", test_bug28934 }, { "test_bug27592", test_bug27592 }, - { "test_bug29948", test_bug29948 }, + /* { "test_bug29948", test_bug29948 }, */ { "test_bug29687", test_bug29687 }, { "test_bug29692", test_bug29692 }, { "test_bug29306", test_bug29306 }, |