diff options
| author | Marko Mäkelä <marko.makela@oracle.com> | 2011-04-06 10:34:49 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@oracle.com> | 2011-04-06 10:34:49 +0300 |
| commit | 484b016fd196e6d05bc4bfd0bdbbfaf3995a4221 (patch) | |
| tree | 035e0bf4f40eaf90df9df669325411111d9940c3 | |
| parent | 2b8312e50c47aa7f186f8e4df5ecd905610273e8 (diff) | |
| download | mariadb-git-484b016fd196e6d05bc4bfd0bdbbfaf3995a4221.tar.gz | |
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.
| -rw-r--r-- | storage/innobase/log/log0log.c | 8 | ||||
| -rw-r--r-- | storage/innobase/srv/srv0start.c | 11 |
2 files changed, 8 insertions, 11 deletions
diff --git a/storage/innobase/log/log0log.c b/storage/innobase/log/log0log.c index d638fe5cb6d..b07135465c3 100644 --- a/storage/innobase/log/log0log.c +++ b/storage/innobase/log/log0log.c @@ -3137,6 +3137,14 @@ loop: log_archive_all(); #endif /* UNIV_LOG_ARCHIVE */ 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 pool: it is essentially a 'crash' of the InnoDB server. Make sure that the log is all flushed to disk, diff --git a/storage/innobase/srv/srv0start.c b/storage/innobase/srv/srv0start.c index 864c71209c0..cf11e75b8e0 100644 --- a/storage/innobase/srv/srv0start.c +++ b/storage/innobase/srv/srv0start.c @@ -2097,17 +2097,6 @@ innobase_shutdown_for_mysql(void) The step 1 is the real InnoDB shutdown. The remaining steps 2 - ... 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(); if (srv_conc_n_threads != 0) { |