summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorJan Lindström <jan.lindstrom@mariadb.com>2017-01-24 15:04:50 +0200
committerJan Lindström <jan.lindstrom@mariadb.com>2017-01-24 15:04:50 +0200
commit51b248cfdd7b0c6c6477be8eda7a0cdd335f11bd (patch)
tree929e52650a085b3704ff1f628a7c491ac89669e4 /extra
parent6495806e59cc27313375fa8d431b7b8e777f73ff (diff)
downloadmariadb-git-51b248cfdd7b0c6c6477be8eda7a0cdd335f11bd.tar.gz
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).
Diffstat (limited to 'extra')
-rw-r--r--extra/innochecksum.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/extra/innochecksum.cc b/extra/innochecksum.cc
index 9d02a545cc5..707451da7fa 100644
--- a/extra/innochecksum.cc
+++ b/extra/innochecksum.cc
@@ -1381,7 +1381,7 @@ static struct my_option innochecksum_options[] = {
{"log", 'l', "log output.",
&log_filename, &log_filename, 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},
{"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},
@@ -1411,7 +1411,7 @@ static void usage(void)
printf("Usage: %s [-c] [-s <start page>] [-e <end page>] "
"[-p <page>] [-v] [-a <allow mismatches>] [-n] "
"[-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");
my_print_help(innochecksum_options);
my_print_variables(innochecksum_options);