From 00a44542e6993105ccda13c4376faef7fa82bf40 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 11 Apr 2006 22:23:16 +0200 Subject: [PATCH] Bug#18012 mysqlslap fails if querystring starts with delimiter - Terminate loop not only when the limit is met, but alse when there is no more stmts client/mysqlslap.c: Terminate loop not only when the limit is met, but alse when there is no more stmts mysql-test/r/mysqlslap.result: Remove the extra statmemnt --- client/mysqlslap.c | 4 ++-- mysql-test/r/mysqlslap.result | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/client/mysqlslap.c b/client/mysqlslap.c index 160e13364a4..9ae5725216f 100644 --- a/client/mysqlslap.c +++ b/client/mysqlslap.c @@ -1174,8 +1174,8 @@ limit_not_met: goto end; } - if (con->limit && queries < con->limit) - goto limit_not_met; + if (!con->stmt && con->limit && queries < con->limit) + goto limit_not_met; end: diff --git a/mysql-test/r/mysqlslap.result b/mysql-test/r/mysqlslap.result index 1a8b77fde1c..045a34a7458 100644 --- a/mysql-test/r/mysqlslap.result +++ b/mysql-test/r/mysqlslap.result @@ -129,7 +129,6 @@ INSERT INTO t1 VALUES (1, 'This is a test'); insert into t2 values ('test', 'test2'); select * from t1; select * from t2; -select * from t1; DROP SCHEMA IF EXISTS `mysqlslap`; DROP SCHEMA IF EXISTS `mysqlslap`; CREATE SCHEMA `mysqlslap`; @@ -141,5 +140,4 @@ INSERT INTO t1 VALUES (1, 'This is a test'); insert into t2 values ('test', 'test2'); select * from t1; select * from t2; -select * from t1; DROP SCHEMA IF EXISTS `mysqlslap`;