database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt

Browse Source 
into  mysql.com:/home/hf/work/29687/my51-29687
This commit is contained in:
holyfoot/hf@hfmain.(none)
2007-07-19 21:03:26 +05:00
parent dfd82a6b74 1657b9e356
commit db2b40b426
2 changed files with 34 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libmysql/libmysql.c
View File

@@ -4939,7 +4939,7 @@ static my_bool reset_stmt_handle(MYSQL_STMT *stmt, uint flags)
Reset stored result set if so was requested or it's a part
of cursor fetch.
*/
if (result->data && (flags & RESET_STORE_RESULT))
if (flags & RESET_STORE_RESULT)
{
/* Result buffered */
free_root(&result->alloc, MYF(MY_KEEP_PREALLOC));

33
tests/mysql_client_test.c
View File

@@ -16271,6 +16271,38 @@ static void test_bug27592()
}
/*
Bug#29687 mysql_stmt_store_result memory leak in libmysqld
*/
static void test_bug29687()
{
const int NUM_ITERATIONS= 40;
int i;
int rc;
MYSQL_STMT *stmt= NULL;
DBUG_ENTER("test_bug29687");
myheader("test_bug29687");
stmt= mysql_simple_prepare(mysql, "SELECT 1 FROM dual WHERE 0=2");
DIE_UNLESS(stmt);
for (i= 0; i < NUM_ITERATIONS; i++)
{
mysql_stmt_execute(stmt);
check_execute(stmt, rc);
mysql_stmt_store_result(stmt);
while (mysql_stmt_fetch(stmt)==0);
mysql_stmt_free_result(stmt);
}
mysql_stmt_close(stmt);
DBUG_VOID_RETURN;
}
/*
Read and parse arguments and MySQL options from my.cnf
*/
@@ -16560,6 +16592,7 @@ static struct my_tests_st my_tests[]= {
{ "test_bug28505", test_bug28505 },
{ "test_bug28934", test_bug28934 },
{ "test_bug27592", test_bug27592 },
{ "test_bug29687", test_bug29687 },
{ 0, 0 }
};