1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

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
This commit is contained in:
unknown
2006-04-11 22:23:16 +02:00
parent 0592560eb5
commit 00a44542e6
2 changed files with 2 additions and 4 deletions

View File

@ -1174,8 +1174,8 @@ limit_not_met:
goto end; goto end;
} }
if (con->limit && queries < con->limit) if (!con->stmt && con->limit && queries < con->limit)
goto limit_not_met; goto limit_not_met;
end: end:

View File

@ -129,7 +129,6 @@ INSERT INTO t1 VALUES (1, 'This is a test');
insert into t2 values ('test', 'test2'); insert into t2 values ('test', 'test2');
select * from t1; select * from t1;
select * from t2; select * from t2;
select * from t1;
DROP SCHEMA IF EXISTS `mysqlslap`; DROP SCHEMA IF EXISTS `mysqlslap`;
DROP SCHEMA IF EXISTS `mysqlslap`; DROP SCHEMA IF EXISTS `mysqlslap`;
CREATE SCHEMA `mysqlslap`; CREATE SCHEMA `mysqlslap`;
@ -141,5 +140,4 @@ INSERT INTO t1 VALUES (1, 'This is a test');
insert into t2 values ('test', 'test2'); insert into t2 values ('test', 'test2');
select * from t1; select * from t1;
select * from t2; select * from t2;
select * from t1;
DROP SCHEMA IF EXISTS `mysqlslap`; DROP SCHEMA IF EXISTS `mysqlslap`;