Skip to content
Permalink
Browse files
Cleanup: Say "mariadbd" instead of "mysqld" in InnoDB messages
  • Loading branch information
dr-m committed Nov 22, 2022
1 parent cff9939 commit 9d38819
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 8 deletions.
@@ -1180,10 +1180,12 @@ ATTRIBUTE_COLD void logs_empty_and_mark_files_at_shutdown()

if (srv_fast_shutdown == 2 || !srv_was_started) {
if (!srv_read_only_mode && srv_was_started) {
ib::info() << "MySQL has requested a very fast"
" shutdown without flushing the InnoDB buffer"
" pool to data files. At the next mysqld"
" startup InnoDB will do a crash recovery!";
sql_print_information(
"InnoDB: Executing innodb_fast_shutdown=2 "
"(without flushing the InnoDB buffer pool"
" to data files)."
" The next mariadbd"
" invocation will perform crash recovery!");

/* In this fastest shutdown we do not flush the
buffer pool:
@@ -1,7 +1,7 @@
/*****************************************************************************
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
the terms of the GNU General Public License as published by the Free Software
@@ -743,7 +743,7 @@ row_mysql_handle_errors(
" table. You have to dump + drop + reimport the"
" table or, in a case of widespread corruption,"
" 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. "
<< FORCE_RECOVERY_MSG;
goto rollback_to_savept;
@@ -1,7 +1,7 @@
/*****************************************************************************
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
the terms of the GNU General Public License as published by the Free Software
@@ -50,7 +50,7 @@ ut_dbg_assertion_failed(
" to https://jira.mariadb.org/\n"
"InnoDB: If you get repeated assertion failures"
" 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: https://mariadb.com/kb/en/library/innodb-recovery-modes/\n"
"InnoDB: about forcing recovery.\n", stderr);

0 comments on commit 9d38819

Please sign in to comment.