Merge omega.weblab:/home/malff/TREE/mysql-5.1-base

into  omega.weblab:/home/malff/TREE/mysql-5.1-rt-merge

1 files changed, 6 insertions, 0 deletions

diff --git a/client/mysqlslap.c b/client/mysqlslap.c
index af29df6e4ba..02a0cbd04c5 100644
--- a/client/mysqlslap.c
+++ b/client/mysqlslap.c
@@ -1673,6 +1673,7 @@ static int
 run_statements(MYSQL *mysql, statement *stmt) 
 {
   statement *ptr;
+  MYSQL_RES *result;
   DBUG_ENTER("run_statements");
 
   for (ptr= stmt; ptr && ptr->length; ptr= ptr->next)
@@ -1683,6 +1684,11 @@ run_statements(MYSQL *mysql, statement *stmt)
               my_progname, (uint)ptr->length, ptr->string, mysql_error(mysql));
       exit(1);
     }
+    if (mysql_field_count(mysql))
+    {
+      result= mysql_store_result(mysql);
+      mysql_free_result(result);
+    }
   }
 
   DBUG_RETURN(0);