summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorNirbhay Choubey <nirbhay.choubey@sun.com>2011-01-16 02:08:24 +0530
committerNirbhay Choubey <nirbhay.choubey@sun.com>2011-01-16 02:08:24 +0530
commitfbc10eeb9d671487566c037f8d954c2250644a5d (patch)
tree80e054483d59ebe256c30382e4e7b998803fbd52 /client
parent3533c1d3717ff4a48967959b72afdb700725519e (diff)
parent44d23cdbc0ecd9efa570cfa58abd0543782995ef (diff)
downloadmariadb-git-fbc10eeb9d671487566c037f8d954c2250644a5d.tar.gz
Merge of fix for bug#58221 from mysql-5.1 -> mysql-5.5.
Diffstat (limited to 'client')
-rw-r--r--client/mysqladmin.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/client/mysqladmin.cc b/client/mysqladmin.cc
index 2c10fdbe853..db362f14b6f 100644
--- a/client/mysqladmin.cc
+++ b/client/mysqladmin.cc
@@ -413,6 +413,9 @@ int main(int argc,char *argv[])
if (interval) /* --sleep=interval given */
{
+ if (opt_count_iterations && --nr_iterations == 0)
+ break;
+
/*
If connection was dropped (unintentionally, or due to SHUTDOWN),
re-establish it if --wait ("retry-connect") was given and user