summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrandon Nesterenko <brandon.nesterenko@mariadb.com>2021-05-18 09:52:13 -0600
committerBrandon Nesterenko <brandon.nesterenko@mariadb.com>2021-05-18 09:52:13 -0600
commitbcf6c9e64f82c3707212e13b58933b0f4670a7fb (patch)
tree6347f4fd9996fe4d39155ffa04af8fd1f36a986d
parentc366845a0b5c08285c958cf1500b3b7906ecf8d4 (diff)
downloadmariadb-git-bb-10.6-MDEV-25222.tar.gz
MDEV-25222: mysqlbinlog --base64-output wrong option default drops BINLOG from outputbb-10.6-MDEV-25222
The --help comment for the --base64-output option in mysqlbinlog was hard to decipher. This quick patch aims to refine it. Reviewed By: ========== Andrei Elkin: <andrei.elkin@mariadb.com>
-rw-r--r--client/mysqlbinlog.cc16
1 files changed, 9 insertions, 7 deletions
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc
index 43d670737a0..81c2e66be46 100644
--- a/client/mysqlbinlog.cc
+++ b/client/mysqlbinlog.cc
@@ -1516,14 +1516,16 @@ static struct my_option my_options[] =
{"base64-output", OPT_BASE64_OUTPUT_MODE,
/* 'unspec' is not mentioned because it is just a placeholder. */
"Determine when the output statements should be base64-encoded BINLOG "
- "statements: 'never' doesn't print binlog row events and should not be "
- "used when directing output to a MariaDB master; "
+ "statements: "
+ "‘never’ neither prints base64 encodings nor verbose event data, and "
+ "will exit on error if a row-based event is found. "
"'decode-rows' decodes row events into commented SQL statements if the "
- "--verbose option is also given; "
- "'auto' prints base64 only when necessary (i.e., for row-based events and "
- "format description events); "
- "If no --base64-output=name option is given at all, the default is "
- "'auto'.",
+ "--verbose option is also given. "
+ "‘auto’ outputs base64 encoded entries for row-based and format "
+ "description events. "
+ "If no option is given at all, the default is ‘auto', and is "
+ "consequently the only option that should be used when row-format events "
+ "are processed for re-execution.",
&opt_base64_output_mode_str, &opt_base64_output_mode_str,
0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
/*