Commit 89a6be64 authored by Jim Winstead's avatar Jim Winstead

mysqladmin --count=X --sleep=Y would always delay Y seconds after the last

iteration before exiting. (Bug #42639)
parent 66f12372
...@@ -371,7 +371,7 @@ int main(int argc,char *argv[]) ...@@ -371,7 +371,7 @@ int main(int argc,char *argv[])
} }
else else
{ {
while (!interrupted && (!opt_count_iterations || nr_iterations)) while (!interrupted)
{ {
new_line = 0; new_line = 0;
if ((error=execute_commands(&mysql,argc,commands))) if ((error=execute_commands(&mysql,argc,commands)))
...@@ -395,11 +395,11 @@ int main(int argc,char *argv[]) ...@@ -395,11 +395,11 @@ int main(int argc,char *argv[])
} }
if (interval) if (interval)
{ {
if (opt_count_iterations && --nr_iterations == 0)
break;
sleep(interval); sleep(interval);
if (new_line) if (new_line)
puts(""); puts("");
if (opt_count_iterations)
nr_iterations--;
} }
else else
break; break;
......
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