Commit 51b248cf authored by Jan Lindström's avatar Jan Lindström

MDEV-11879: Duplicate option innochecksum -l (--log, --leaf)

Move --leaf under -e to avoid duplicate option and retain
-l for --log (to maintain compatibility with MySQL 5.7).
parent 6495806e
...@@ -1381,7 +1381,7 @@ static struct my_option innochecksum_options[] = { ...@@ -1381,7 +1381,7 @@ static struct my_option innochecksum_options[] = {
{"log", 'l', "log output.", {"log", 'l', "log output.",
&log_filename, &log_filename, 0, &log_filename, &log_filename, 0,
GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"leaf", 'l', "Examine leaf index pages", {"leaf", 'e', "Examine leaf index pages",
&do_leaf, &do_leaf, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, &do_leaf, &do_leaf, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
{"merge", 'm', "leaf page count if merge given number of consecutive pages", {"merge", 'm', "leaf page count if merge given number of consecutive pages",
&n_merge, &n_merge, 0, GET_ULONG, REQUIRED_ARG, 0, 0, (longlong)10L, 0, 1, 0}, &n_merge, &n_merge, 0, GET_ULONG, REQUIRED_ARG, 0, 0, (longlong)10L, 0, 1, 0},
...@@ -1411,7 +1411,7 @@ static void usage(void) ...@@ -1411,7 +1411,7 @@ static void usage(void)
printf("Usage: %s [-c] [-s <start page>] [-e <end page>] " printf("Usage: %s [-c] [-s <start page>] [-e <end page>] "
"[-p <page>] [-v] [-a <allow mismatches>] [-n] " "[-p <page>] [-v] [-a <allow mismatches>] [-n] "
"[-C <strict-check>] [-w <write>] [-S] [-D <page type dump>] " "[-C <strict-check>] [-w <write>] [-S] [-D <page type dump>] "
"[-l <log>] <filename or [-]>\n", my_progname); "[-l <log>] [-e] <filename or [-]>\n", my_progname);
printf("See " REFMAN "innochecksum.html for usage hints.\n"); printf("See " REFMAN "innochecksum.html for usage hints.\n");
my_print_help(innochecksum_options); my_print_help(innochecksum_options);
my_print_variables(innochecksum_options); my_print_variables(innochecksum_options);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment