Commit 9bc74eef authored by unknown's avatar unknown

Discovered a bug while working with backup. Since it is possible to execute a...

Discovered a bug while working with backup. Since it is possible to execute a statement in a pre/post statment clause that can return a result, we need to test for that and free it. 


client/mysqlslap.c:
  Cleanup resuls if rows are returned.
parent c3f8e763
...@@ -1673,6 +1673,7 @@ static int ...@@ -1673,6 +1673,7 @@ static int
run_statements(MYSQL *mysql, statement *stmt) run_statements(MYSQL *mysql, statement *stmt)
{ {
statement *ptr; statement *ptr;
MYSQL_RES *result;
DBUG_ENTER("run_statements"); DBUG_ENTER("run_statements");
for (ptr= stmt; ptr && ptr->length; ptr= ptr->next) for (ptr= stmt; ptr && ptr->length; ptr= ptr->next)
...@@ -1683,6 +1684,11 @@ run_statements(MYSQL *mysql, statement *stmt) ...@@ -1683,6 +1684,11 @@ run_statements(MYSQL *mysql, statement *stmt)
my_progname, (uint)ptr->length, ptr->string, mysql_error(mysql)); my_progname, (uint)ptr->length, ptr->string, mysql_error(mysql));
exit(1); exit(1);
} }
if (mysql_field_count(mysql))
{
result= mysql_store_result(mysql);
mysql_free_result(result);
}
} }
DBUG_RETURN(0); DBUG_RETURN(0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment