From d57bb98ff5c62fff7d9912dd0a96ad99fcab3861 Mon Sep 17 00:00:00 2001 From: Jim Winstead Date: Wed, 20 May 2009 17:25:10 -0700 Subject: mysqladmin --count=X --sleep=Y would always delay Y seconds after the last iteration before exiting. (Bug #42639) --- client/mysqladmin.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'client/mysqladmin.cc') diff --git a/client/mysqladmin.cc b/client/mysqladmin.cc index 09821d6a995..a4e7c5ad0c9 100644 --- a/client/mysqladmin.cc +++ b/client/mysqladmin.cc @@ -371,7 +371,7 @@ int main(int argc,char *argv[]) } else { - while (!interrupted && (!opt_count_iterations || nr_iterations)) + while (!interrupted) { new_line = 0; if ((error=execute_commands(&mysql,argc,commands))) @@ -395,11 +395,11 @@ int main(int argc,char *argv[]) } if (interval) { + if (opt_count_iterations && --nr_iterations == 0) + break; sleep(interval); if (new_line) puts(""); - if (opt_count_iterations) - nr_iterations--; } else break; -- cgit v1.2.1