Commit 092602ac authored by Marko Mäkelä's avatar Marko Mäkelä

MDEV-14130 InnoDB messages should not refer to the MySQL 5.7 manual

In InnoDB error messages, replace the hyperlink URLs to point
to the MariaDB knowledge base.
parent 5fb4c0a8
/* /*
Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved. Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2014, 2017, MariaDB Corporation. Copyright (c) 2014, 2019, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
...@@ -1231,7 +1231,7 @@ static struct my_option innochecksum_options[] = { ...@@ -1231,7 +1231,7 @@ static struct my_option innochecksum_options[] = {
{"verbose", 'v', "Verbose (prints progress every 5 seconds).", {"verbose", 'v', "Verbose (prints progress every 5 seconds).",
&verbose, &verbose, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, &verbose, &verbose, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
#ifndef DBUG_OFF #ifndef DBUG_OFF
{"debug", '#', "Output debug log. See " REFMAN "dbug-package.html", {"debug", '#', "Output debug log. See https://mariadb.com/kb/en/library/creating-a-trace-file/",
&dbug_setting, &dbug_setting, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0}, &dbug_setting, &dbug_setting, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
#endif /* !DBUG_OFF */ #endif /* !DBUG_OFF */
{"count", 'c', "Print the count of pages in the file and exits.", {"count", 'c', "Print the count of pages in the file and exits.",
...@@ -1298,7 +1298,8 @@ static void usage(void) ...@@ -1298,7 +1298,8 @@ static void usage(void)
"[-p <page>] [-i] [-v] [-a <allow mismatches>] [-n] " "[-p <page>] [-i] [-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>] [-l] [-m <merge pages>] <filename or [-]>\n", my_progname); "[-l <log>] [-l] [-m <merge pages>] <filename or [-]>\n", my_progname);
printf("See " REFMAN "innochecksum.html for usage hints.\n"); printf("See https://mariadb.com/kb/en/library/innochecksum/"
" for usage hints.\n");
my_print_help(innochecksum_options); my_print_help(innochecksum_options);
my_print_variables(innochecksum_options); my_print_variables(innochecksum_options);
} }
......
...@@ -43,10 +43,12 @@ Copyright (c) YEAR, YEAR , Oracle, MariaDB Corporation Ab and others. ...@@ -43,10 +43,12 @@ Copyright (c) YEAR, YEAR , Oracle, MariaDB Corporation Ab and others.
InnoDB offline file checksum utility. InnoDB offline file checksum utility.
Usage: innochecksum [-c] [-s <start page>] [-e <end page>] [-p <page>] [-i] [-v] [-a <allow mismatches>] [-n] [-C <strict-check>] [-w <write>] [-S] [-D <page type dump>] [-l <log>] [-l] [-m <merge pages>] <filename or [-]> Usage: innochecksum [-c] [-s <start page>] [-e <end page>] [-p <page>] [-i] [-v] [-a <allow mismatches>] [-n] [-C <strict-check>] [-w <write>] [-S] [-D <page type dump>] [-l <log>] [-l] [-m <merge pages>] <filename or [-]>
See https://mariadb.com/kb/en/library/innochecksum/ for usage hints.
-?, --help Displays this help and exits. -?, --help Displays this help and exits.
-I, --info Synonym for --help. -I, --info Synonym for --help.
-V, --version Displays version information and exits. -V, --version Displays version information and exits.
-v, --verbose Verbose (prints progress every 5 seconds). -v, --verbose Verbose (prints progress every 5 seconds).
https://mariadb.com/kb/en/library/creating-a-trace-file/
-c, --count Print the count of pages in the file and exits. -c, --count Print the count of pages in the file and exits.
-s, --start-page=# Start on this page number (0 based). -s, --start-page=# Start on this page number (0 based).
-e, --end-page=# End at this page number (0 based). -e, --end-page=# End at this page number (0 based).
......
...@@ -6261,9 +6261,9 @@ ha_innobase::open(const char* name, int, uint) ...@@ -6261,9 +6261,9 @@ ha_innobase::open(const char* name, int, uint)
<< n_cols << " user" << n_cols << " user"
" defined columns in InnoDB, but " << n_fields " defined columns in InnoDB, but " << n_fields
<< " columns in MariaDB. Please check" << " columns in MariaDB. Please check"
" INFORMATION_SCHEMA.INNODB_SYS_COLUMNS and " REFMAN " INFORMATION_SCHEMA.INNODB_SYS_COLUMNS and"
"innodb-troubleshooting.html for how to resolve the" " https://mariadb.com/kb/en/innodb-data-dictionary-troubleshooting/"
" issue."; " for how to resolve the issue.";
/* Mark this table as corrupted, so the drop table /* Mark this table as corrupted, so the drop table
or force recovery can still use it, but not others. */ or force recovery can still use it, but not others. */
...@@ -22101,11 +22101,11 @@ ib_errf( ...@@ -22101,11 +22101,11 @@ ib_errf(
/* Keep the first 16 characters as-is, since the url is sometimes used /* Keep the first 16 characters as-is, since the url is sometimes used
as an offset from this.*/ as an offset from this.*/
const char* TROUBLESHOOTING_MSG = const char* TROUBLESHOOTING_MSG =
"Please refer to " REFMAN "innodb-troubleshooting.html" "Please refer to https://mariadb.com/kb/en/innodb-troubleshooting/"
" for how to resolve the issue."; " for how to resolve the issue.";
const char* TROUBLESHOOT_DATADICT_MSG = const char* TROUBLESHOOT_DATADICT_MSG =
"Please refer to " REFMAN "innodb-troubleshooting-datadict.html" "Please refer to https://mariadb.com/kb/en/innodb-data-dictionary-troubleshooting/"
" for how to resolve the issue."; " for how to resolve the issue.";
const char* BUG_REPORT_MSG = const char* BUG_REPORT_MSG =
...@@ -22116,9 +22116,6 @@ const char* FORCE_RECOVERY_MSG = ...@@ -22116,9 +22116,6 @@ const char* FORCE_RECOVERY_MSG =
"https://mariadb.com/kb/en/library/innodb-recovery-modes/" "https://mariadb.com/kb/en/library/innodb-recovery-modes/"
" for information about forcing recovery."; " for information about forcing recovery.";
const char* ERROR_CREATING_MSG =
"Please refer to " REFMAN "error-creating-innodb.html";
const char* OPERATING_SYSTEM_ERROR_MSG = const char* OPERATING_SYSTEM_ERROR_MSG =
"Some operating system error numbers are described at" "Some operating system error numbers are described at"
" https://mariadb.com/kb/en/library/operating-system-error-codes/"; " https://mariadb.com/kb/en/library/operating-system-error-codes/";
...@@ -22511,8 +22508,7 @@ ib_push_frm_error( ...@@ -22511,8 +22508,7 @@ ib_push_frm_error(
" Have you mixed up " " Have you mixed up "
".frm files from different " ".frm files from different "
"installations? See " "installations? See "
REFMAN "https://mariadb.com/kb/en/innodb-troubleshooting/\n",
"innodb-troubleshooting.html\n",
ib_table->name.m_name); ib_table->name.m_name);
if (push_warning) { if (push_warning) {
...@@ -22555,8 +22551,7 @@ ib_push_frm_error( ...@@ -22555,8 +22551,7 @@ ib_push_frm_error(
" Have you mixed up " " Have you mixed up "
".frm files from different " ".frm files from different "
"installations? See " "installations? See "
REFMAN "https://mariadb.com/kb/en/innodb-troubleshooting/\n",
"innodb-troubleshooting.html\n",
ib_table->name.m_name, n_keys, ib_table->name.m_name, n_keys,
table->s->keys); table->s->keys);
......
/***************************************************************************** /*****************************************************************************
Copyright (c) 2006, 2016, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2006, 2016, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2017, 2018, MariaDB Corporation. Copyright (c) 2017, 2019, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software the terms of the GNU General Public License as published by the Free Software
...@@ -442,7 +442,6 @@ extern const char* TROUBLESHOOTING_MSG; ...@@ -442,7 +442,6 @@ extern const char* TROUBLESHOOTING_MSG;
extern const char* TROUBLESHOOT_DATADICT_MSG; extern const char* TROUBLESHOOT_DATADICT_MSG;
extern const char* BUG_REPORT_MSG; extern const char* BUG_REPORT_MSG;
extern const char* FORCE_RECOVERY_MSG; extern const char* FORCE_RECOVERY_MSG;
extern const char* ERROR_CREATING_MSG;
extern const char* OPERATING_SYSTEM_ERROR_MSG; extern const char* OPERATING_SYSTEM_ERROR_MSG;
extern const char* FOREIGN_KEY_CONSTRAINTS_MSG; extern const char* FOREIGN_KEY_CONSTRAINTS_MSG;
extern const char* SET_TRANSACTION_MSG; extern const char* SET_TRANSACTION_MSG;
......
...@@ -57,10 +57,6 @@ component, i.e. we show M.N.P as M.N */ ...@@ -57,10 +57,6 @@ component, i.e. we show M.N.P as M.N */
IB_TO_STR(INNODB_VERSION_MINOR) "." \ IB_TO_STR(INNODB_VERSION_MINOR) "." \
IB_TO_STR(INNODB_VERSION_BUGFIX) IB_TO_STR(INNODB_VERSION_BUGFIX)
#define REFMAN "http://dev.mysql.com/doc/refman/" \
IB_TO_STR(INNODB_VERSION_MAJOR) "." \
IB_TO_STR(INNODB_VERSION_MINOR) "/en/"
/** How far ahead should we tell the service manager the timeout /** How far ahead should we tell the service manager the timeout
(time in seconds) */ (time in seconds) */
#define INNODB_EXTEND_TIMEOUT_INTERVAL 30 #define INNODB_EXTEND_TIMEOUT_INTERVAL 30
......
...@@ -1325,7 +1325,7 @@ recv_find_max_checkpoint(ulint* max_field) ...@@ -1325,7 +1325,7 @@ recv_find_max_checkpoint(ulint* max_field)
" The redo log was created" " The redo log was created"
" with " << creator << " with " << creator <<
". Please follow the instructions at " ". Please follow the instructions at "
REFMAN "upgrading-downgrading.html"; "https://mariadb.com/kb/en/library/upgrading/";
/* Do not issue a message about a possibility /* Do not issue a message about a possibility
to cleanly shut down the newer server version to cleanly shut down the newer server version
and to remove the redo logs, because the and to remove the redo logs, because the
......
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