Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
9d388192
Commit
9d388192
authored
Nov 22, 2022
by
Marko Mäkelä
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cleanup: Say "mariadbd" instead of "mysqld" in InnoDB messages
parent
cff9939d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
8 deletions
+10
-8
storage/innobase/log/log0log.cc
storage/innobase/log/log0log.cc
+6
-4
storage/innobase/row/row0mysql.cc
storage/innobase/row/row0mysql.cc
+2
-2
storage/innobase/ut/ut0dbg.cc
storage/innobase/ut/ut0dbg.cc
+2
-2
No files found.
storage/innobase/log/log0log.cc
View file @
9d388192
...
...
@@ -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:
...
...
storage/innobase/row/row0mysql.cc
View file @
9d388192
/*****************************************************************************
Copyright (c) 2000, 2018, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2015, 202
1
, MariaDB Corporation.
Copyright (c) 2015, 202
2
, 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 m
ysql
d server crashes after"
" tablespace. If the m
ariadb
d server crashes after"
" the startup or when you dump the tables. "
<<
FORCE_RECOVERY_MSG
;
goto
rollback_to_savept
;
...
...
storage/innobase/ut/ut0dbg.cc
View file @
9d388192
/*****************************************************************************
Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2017, 20
18
, MariaDB Corporation.
Copyright (c) 2017, 20
22
, 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 m
ysql
d startup, there may be
\n
"
"InnoDB: immediately after the m
ariadb
d 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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment