diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2017-01-25 07:51:08 +0200 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2017-01-25 08:54:02 +0200 |
| commit | ddc14d8eb7361ff92b442e3d2fdc2e70e32af6b0 (patch) | |
| tree | faf00a3f0407a6f63df55262764f577cee8f2c90 | |
| parent | 84895c3cd7ce3ca4a33ac03f13b25f2bc0c6db67 (diff) | |
| download | mariadb-git-ddc14d8eb7361ff92b442e3d2fdc2e70e32af6b0.tar.gz | |
MDEV-10942: innodb_zip.innochecksum_3, innodb_zip.innochecksum_2
fail in buildbot.
Fixed test results.
| -rw-r--r-- | extra/innochecksum.cc | 2 | ||||
| -rw-r--r-- | mysql-test/suite/innodb_zip/r/innochecksum_2.result | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/extra/innochecksum.cc b/extra/innochecksum.cc index 707451da7fa..393b1af062c 100644 --- a/extra/innochecksum.cc +++ b/extra/innochecksum.cc @@ -1346,10 +1346,8 @@ static struct my_option innochecksum_options[] = { 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, {"verbose", 'v', "Verbose (prints progress every 5 seconds).", &verbose, &verbose, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, -#ifndef DBUG_OFF {"debug", '#', "Output debug log. See " REFMAN "dbug-package.html", &dbug_setting, &dbug_setting, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0}, -#endif /* !DBUG_OFF */ {"count", 'c', "Print the count of pages in the file and exits.", &just_count, &just_count, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, {"start_page", 's', "Start on this page number (0 based).", diff --git a/mysql-test/suite/innodb_zip/r/innochecksum_2.result b/mysql-test/suite/innodb_zip/r/innochecksum_2.result index 649c32b1a87..78d8a1cbf90 100644 --- a/mysql-test/suite/innodb_zip/r/innochecksum_2.result +++ b/mysql-test/suite/innodb_zip/r/innochecksum_2.result @@ -41,7 +41,7 @@ innochecksum Ver #.#.# Copyright (c) YEAR, YEAR , Oracle, MariaDB Corporation Ab and others. InnoDB offline file checksum utility. -Usage: innochecksum [-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 [-]> +Usage: innochecksum [-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>] [-e] <filename or [-]> -?, --help Displays this help and exits. -I, --info Synonym for --help. -V, --version Displays version information and exits. @@ -63,7 +63,7 @@ Usage: innochecksum [-c] [-s <start page>] [-e <end page>] [-p <page>] [-v] [-a -D, --page-type-dump=name Dump the page type info for each page in a tablespace. -l, --log=name log output. - -l, --leaf Examine leaf index pages + -e, --leaf Examine leaf index pages -m, --merge=# leaf page count if merge given number of consecutive pages |