summaryrefslogtreecommitdiff
path: root/client/mysqlbinlog.cc
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2017-11-10 01:14:58 +0100
committerSergei Golubchik <serg@mariadb.org>2017-11-10 01:14:58 +0100
commit7002291b8aa2e036a7adfd23d961dc09b4f01f46 (patch)
tree18dc7afd966c2c7ec6b02b958d3d4bb0c701b021 /client/mysqlbinlog.cc
parentd79fd5ba7ff275c9fd003f2486b42eb87892ca9a (diff)
parent56394a78e361bf0205a506185ee95a0ab012b621 (diff)
downloadmariadb-git-7002291b8aa2e036a7adfd23d961dc09b4f01f46.tar.gz
Merge branch '10.0' into 10.1
Diffstat (limited to 'client/mysqlbinlog.cc')
-rw-r--r--client/mysqlbinlog.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc
index 7a4b34c40c6..c103061bbc5 100644
--- a/client/mysqlbinlog.cc
+++ b/client/mysqlbinlog.cc
@@ -2670,10 +2670,11 @@ int main(int argc, char** argv)
if (!argc || opt_version)
{
- if (!argc)
- usage();
if (!opt_version)
+ {
+ usage();
retval= ERROR_STOP;
+ }
goto err;
}