Commit 00a44542 authored by unknown's avatar unknown
Browse files

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
parent 0592560e

client/mysqlslap.c

+2 −2
Original line number Diff line number Diff line
@@ -1174,7 +1174,7 @@ run_task(thread_context *con) 
        goto end;

    }



  if (con->limit && queries < con->limit)

    if (!con->stmt && con->limit && queries < con->limit)

      goto limit_not_met;



end:

mysql-test/r/mysqlslap.result

+0 −2
Original line number Diff line number Diff line
@@ -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`;