diff options
author | Nirbhay Choubey <nirbhay.choubey@sun.com> | 2011-01-16 02:08:24 +0530 |
---|---|---|
committer | Nirbhay Choubey <nirbhay.choubey@sun.com> | 2011-01-16 02:08:24 +0530 |
commit | e664d1c69bf6dda8833bdaed085756ef23de0890 (patch) | |
tree | 80e054483d59ebe256c30382e4e7b998803fbd52 /client/mysqladmin.cc | |
parent | b32f32aa6ef63cbd4efb072aacbdf8d8bdb05558 (diff) | |
parent | 208b677637ef9d140c1629a0de4d4963c02ea533 (diff) | |
download | mariadb-git-e664d1c69bf6dda8833bdaed085756ef23de0890.tar.gz |
Merge of fix for bug#58221 from mysql-5.1 -> mysql-5.5.
Diffstat (limited to 'client/mysqladmin.cc')
-rw-r--r-- | client/mysqladmin.cc | 3 |
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 |