summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.org>2017-11-29 12:06:48 +0400
committerAlexander Barkov <bar@mariadb.org>2017-11-29 12:06:48 +0400
commit5b697c5a23ed7322b5b746b61e3ec66b510ca134 (patch)
tree22f086fad2685d1a45b8531f96f30ed7fabb7554 /client
parente01d33d773abbffad0ea1739f0e04816eecce89d (diff)
parentb65fd73bb19578148e41d788504ae18812c2cb43 (diff)
downloadmariadb-git-5b697c5a23ed7322b5b746b61e3ec66b510ca134.tar.gz
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Diffstat (limited to 'client')
-rw-r--r--client/mysqlbinlog.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc
index 2712e6ea668..dc237078be8 100644
--- a/client/mysqlbinlog.cc
+++ b/client/mysqlbinlog.cc
@@ -2952,10 +2952,11 @@ int main(int argc, char** argv)
if (!argc || opt_version)
{
- if (!argc)
- usage();
if (!opt_version)
+ {
+ usage();
retval= ERROR_STOP;
+ }
goto err;
}