diff options
Diffstat (limited to 'innobase')
| -rw-r--r-- | innobase/include/srv0srv.h | 1 | ||||
| -rw-r--r-- | innobase/log/log0log.c | 15 | ||||
| -rw-r--r-- | innobase/srv/srv0srv.c | 6 | ||||
| -rw-r--r-- | innobase/srv/srv0start.c | 8 |
4 files changed, 22 insertions, 8 deletions
diff --git a/innobase/include/srv0srv.h b/innobase/include/srv0srv.h index 3f014adb76c..b77d7d5436a 100644 --- a/innobase/include/srv0srv.h +++ b/innobase/include/srv0srv.h @@ -70,6 +70,7 @@ extern ulint srv_n_rows_read; extern ibool srv_print_innodb_monitor; extern ibool srv_print_innodb_lock_monitor; extern ibool srv_print_innodb_tablespace_monitor; +extern ibool srv_print_verbose_log; extern ulint srv_n_spin_wait_rounds; extern ulint srv_spin_wait_delay; diff --git a/innobase/log/log0log.c b/innobase/log/log0log.c index beac63535ab..ec42c8f2e08 100644 --- a/innobase/log/log0log.c +++ b/innobase/log/log0log.c @@ -2641,9 +2641,11 @@ logs_empty_and_mark_files_at_shutdown(void) dulint lsn; ulint arch_log_no; - ut_print_timestamp(stderr); - fprintf(stderr, " InnoDB: Starting shutdown...\n"); - + if (srv_print_verbose_log) + { + ut_print_timestamp(stderr); + fprintf(stderr, " InnoDB: Starting shutdown...\n"); + } /* Wait until the master thread and all other operations are idle: our algorithm only works if the server is idle at shutdown */ loop: @@ -2732,8 +2734,11 @@ loop: fil_flush_file_spaces(FIL_TABLESPACE); - ut_print_timestamp(stderr); - fprintf(stderr, " InnoDB: Shutdown completed\n"); + if (srv_print_verbose_log) + { + ut_print_timestamp(stderr); + fprintf(stderr, " InnoDB: Shutdown completed\n"); + } } /********************************************************** diff --git a/innobase/srv/srv0srv.c b/innobase/srv/srv0srv.c index ba556e1c050..1237a788622 100644 --- a/innobase/srv/srv0srv.c +++ b/innobase/srv/srv0srv.c @@ -120,6 +120,12 @@ ibool srv_print_innodb_monitor = FALSE; ibool srv_print_innodb_lock_monitor = FALSE; ibool srv_print_innodb_tablespace_monitor = FALSE; +/* + Set the following to 0 if you want InnoDB to write messages on + stderr on startup/shutdown +*/ +ibool srv_print_verbose_log = TRUE; + /* The parameters below are obsolete: */ ibool srv_print_parsed_sql = FALSE; diff --git a/innobase/srv/srv0start.c b/innobase/srv/srv0start.c index 15d99ab3001..2e9bade8b35 100644 --- a/innobase/srv/srv0start.c +++ b/innobase/srv/srv0start.c @@ -888,9 +888,11 @@ innobase_start_or_create_for_mysql(void) /* buf_debug_prints = TRUE; */ - ut_print_timestamp(stderr); - fprintf(stderr, " InnoDB: Started\n"); - + if (srv_print_verbose_log) + { + ut_print_timestamp(stderr); + fprintf(stderr, " InnoDB: Started\n"); + } return((int) DB_SUCCESS); } |