MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Jim Winstead Date:May 21 2009 12:26am
Subject:bzr commit into mysql-5.1-bugteam branch (jimw:2906) Bug#42639
View as plain text  
#At file:///Users/jimw/my/mysql-5.1/ based on revid:jimw@stripped

 2906 Jim Winstead	2009-05-20
      mysqladmin --count=X --sleep=Y would always delay Y seconds after the last
      iteration before exiting. (Bug #42639)
      modified:
        client/mysqladmin.cc

=== modified file 'client/mysqladmin.cc'
--- a/client/mysqladmin.cc	2009-05-18 21:19:18 +0000
+++ b/client/mysqladmin.cc	2009-05-21 00:25:10 +0000
@@ -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;

Thread
bzr commit into mysql-5.1-bugteam branch (jimw:2906) Bug#42639Jim Winstead21 May