Commit 996d50e2 authored by Marko Mäkelä's avatar Marko Mäkelä

Non-functional change: move a printout

from innobase_shutdown_for_mysql() to
logs_empty_and_mark_files_at_shutdown()
where the rest of the logic is located.
parent 27d6f9a5
...@@ -3137,6 +3137,14 @@ logs_empty_and_mark_files_at_shutdown(void) ...@@ -3137,6 +3137,14 @@ logs_empty_and_mark_files_at_shutdown(void)
log_archive_all(); log_archive_all();
#endif /* UNIV_LOG_ARCHIVE */ #endif /* UNIV_LOG_ARCHIVE */
if (srv_fast_shutdown == 2) { if (srv_fast_shutdown == 2) {
ut_print_timestamp(stderr);
fprintf(stderr,
" InnoDB: 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!\n");
/* In this fastest shutdown we do not flush the buffer /* In this fastest shutdown we do not flush the buffer
pool: it is essentially a 'crash' of the InnoDB pool: it is essentially a 'crash' of the InnoDB
server. Make sure that the log is all flushed to disk, server. Make sure that the log is all flushed to disk,
......
...@@ -2097,17 +2097,6 @@ innobase_shutdown_for_mysql(void) ...@@ -2097,17 +2097,6 @@ innobase_shutdown_for_mysql(void)
The step 1 is the real InnoDB shutdown. The remaining steps 2 - ... The step 1 is the real InnoDB shutdown. The remaining steps 2 - ...
just free data structures after the shutdown. */ just free data structures after the shutdown. */
if (srv_fast_shutdown == 2) {
ut_print_timestamp(stderr);
fprintf(stderr,
" InnoDB: 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!\n");
}
logs_empty_and_mark_files_at_shutdown(); logs_empty_and_mark_files_at_shutdown();
if (srv_conc_n_threads != 0) { if (srv_conc_n_threads != 0) {
......
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