Commit 9d388192 authored by Marko Mäkelä's avatar Marko Mäkelä

Cleanup: Say "mariadbd" instead of "mysqld" in InnoDB messages

parent cff9939d
...@@ -1180,10 +1180,12 @@ ATTRIBUTE_COLD void logs_empty_and_mark_files_at_shutdown() ...@@ -1180,10 +1180,12 @@ ATTRIBUTE_COLD void logs_empty_and_mark_files_at_shutdown()
if (srv_fast_shutdown == 2 || !srv_was_started) { if (srv_fast_shutdown == 2 || !srv_was_started) {
if (!srv_read_only_mode && srv_was_started) { if (!srv_read_only_mode && srv_was_started) {
ib::info() << "MySQL has requested a very fast" sql_print_information(
" shutdown without flushing the InnoDB buffer" "InnoDB: Executing innodb_fast_shutdown=2 "
" pool to data files. At the next mysqld" "(without flushing the InnoDB buffer pool"
" startup InnoDB will do a crash recovery!"; " to data files)."
" The next mariadbd"
" invocation will perform crash recovery!");
/* In this fastest shutdown we do not flush the /* In this fastest shutdown we do not flush the
buffer pool: buffer pool:
......
/***************************************************************************** /*****************************************************************************
Copyright (c) 2000, 2018, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2000, 2018, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2015, 2021, MariaDB Corporation. Copyright (c) 2015, 2022, 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
...@@ -743,7 +743,7 @@ row_mysql_handle_errors( ...@@ -743,7 +743,7 @@ row_mysql_handle_errors(
" table. You have to dump + drop + reimport the" " table. You have to dump + drop + reimport the"
" table or, in a case of widespread corruption," " table or, in a case of widespread corruption,"
" dump all InnoDB tables and recreate the whole" " dump all InnoDB tables and recreate the whole"
" tablespace. If the mysqld server crashes after" " tablespace. If the mariadbd server crashes after"
" the startup or when you dump the tables. " " the startup or when you dump the tables. "
<< FORCE_RECOVERY_MSG; << FORCE_RECOVERY_MSG;
goto rollback_to_savept; goto rollback_to_savept;
......
/***************************************************************************** /*****************************************************************************
Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2017, 2018, MariaDB Corporation. Copyright (c) 2017, 2022, 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
...@@ -50,7 +50,7 @@ ut_dbg_assertion_failed( ...@@ -50,7 +50,7 @@ ut_dbg_assertion_failed(
" to https://jira.mariadb.org/\n" " to https://jira.mariadb.org/\n"
"InnoDB: If you get repeated assertion failures" "InnoDB: If you get repeated assertion failures"
" or crashes, even\n" " or crashes, even\n"
"InnoDB: immediately after the mysqld startup, there may be\n" "InnoDB: immediately after the mariadbd startup, there may be\n"
"InnoDB: corruption in the InnoDB tablespace. Please refer to\n" "InnoDB: corruption in the InnoDB tablespace. Please refer to\n"
"InnoDB: https://mariadb.com/kb/en/library/innodb-recovery-modes/\n" "InnoDB: https://mariadb.com/kb/en/library/innodb-recovery-modes/\n"
"InnoDB: about forcing recovery.\n", stderr); "InnoDB: about forcing recovery.\n", stderr);
......
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