Merge branch '10.6' into 10.11

client/mysqlbinlog.cc

@@ -3546,7 +3546,8 @@ int main(int argc, char** argv)
   {
     if (!opt_version)
     {
-      usage();
+      error("Please provide the log file(s). Run with '--help' for usage "
+            "instructions.");
       retval= ERROR_STOP;
     }
     goto err;