diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2015-05-22 08:24:59 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2015-05-30 20:45:17 +0300 |
| commit | 59815a268b37a9859c31d6add4546f4c6a7ef6aa (patch) | |
| tree | cbcc99a5fdbda671b5b16bac81b8e78a421f47cb /storage/innobase/srv | |
| parent | 84eaf0911f311acba797c265ef7508ab6c108b35 (diff) | |
| download | mariadb-git-59815a268b37a9859c31d6add4546f4c6a7ef6aa.tar.gz | |
MDEV-7484: Log Time not consistent with InnoDB errors nor with MySQL error log time format
Diffstat (limited to 'storage/innobase/srv')
| -rw-r--r-- | storage/innobase/srv/srv0start.cc | 47 |
1 files changed, 20 insertions, 27 deletions
diff --git a/storage/innobase/srv/srv0start.cc b/storage/innobase/srv/srv0start.cc index 5d26af7782e..be98ece404c 100644 --- a/storage/innobase/srv/srv0start.cc +++ b/storage/innobase/srv/srv0start.cc @@ -495,7 +495,8 @@ DECLARE_THREAD(io_handler_thread)( segment = *((ulint*) arg); #ifdef UNIV_DEBUG_THREAD_CREATION - fprintf(stderr, "Io handler thread %lu starts, id %lu\n", segment, + ib_logf(IB_LOG_LEVEL_INFO, + "Io handler thread %lu starts, id %lu\n", segment, os_thread_pf(os_thread_get_curr_id())); #endif @@ -1619,53 +1620,45 @@ innobase_start_or_create_for_mysql(void) } #ifdef UNIV_DEBUG - ut_print_timestamp(stderr); - fprintf(stderr, - " InnoDB: !!!!!!!! UNIV_DEBUG switched on !!!!!!!!!\n"); + ib_logf(IB_LOG_LEVEL_INFO, + " InnoDB: !!!!!!!! UNIV_DEBUG switched on !!!!!!!!!"); #endif #ifdef UNIV_IBUF_DEBUG - ut_print_timestamp(stderr); - fprintf(stderr, - " InnoDB: !!!!!!!! UNIV_IBUF_DEBUG switched on !!!!!!!!!\n"); + ib_logf(IB_LOG_LEVEL_INFO, + " InnoDB: !!!!!!!! UNIV_IBUF_DEBUG switched on !!!!!!!!!"); # ifdef UNIV_IBUF_COUNT_DEBUG - ut_print_timestamp(stderr); - fprintf(stderr, + ib_logf(IB_LOG_LEVEL_INFO, " InnoDB: !!!!!!!! UNIV_IBUF_COUNT_DEBUG switched on " - "!!!!!!!!!\n"); - ut_print_timestamp(stderr); - fprintf(stderr, - " InnoDB: Crash recovery will fail with UNIV_IBUF_COUNT_DEBUG\n"); + "!!!!!!!!!"); + ib_logf(IB_LOG_LEVEL_INFO, + " InnoDB: Crash recovery will fail with UNIV_IBUF_COUNT_DEBUG"); # endif #endif #ifdef UNIV_BLOB_DEBUG - fprintf(stderr, + ib_logf(IB_LOG_LEVEL_INFO, "InnoDB: !!!!!!!! UNIV_BLOB_DEBUG switched on !!!!!!!!!\n" - "InnoDB: Server restart may fail with UNIV_BLOB_DEBUG\n"); + "InnoDB: Server restart may fail with UNIV_BLOB_DEBUG"); #endif /* UNIV_BLOB_DEBUG */ #ifdef UNIV_SYNC_DEBUG - ut_print_timestamp(stderr); - fprintf(stderr, - " InnoDB: !!!!!!!! UNIV_SYNC_DEBUG switched on !!!!!!!!!\n"); + ib_logf(IB_LOG_LEVEL_INFO, + " InnoDB: !!!!!!!! UNIV_SYNC_DEBUG switched on !!!!!!!!!"); #endif #ifdef UNIV_SEARCH_DEBUG - ut_print_timestamp(stderr); - fprintf(stderr, - " InnoDB: !!!!!!!! UNIV_SEARCH_DEBUG switched on !!!!!!!!!\n"); + ib_logf(IB_LOG_LEVEL_INFO, + " InnoDB: !!!!!!!! UNIV_SEARCH_DEBUG switched on !!!!!!!!!"); #endif #ifdef UNIV_LOG_LSN_DEBUG - ut_print_timestamp(stderr); - fprintf(stderr, - " InnoDB: !!!!!!!! UNIV_LOG_LSN_DEBUG switched on !!!!!!!!!\n"); + ib_logf(IB_LOG_LEVEL_INFO, + " InnoDB: !!!!!!!! UNIV_LOG_LSN_DEBUG switched on !!!!!!!!!"); #endif /* UNIV_LOG_LSN_DEBUG */ #ifdef UNIV_MEM_DEBUG - ut_print_timestamp(stderr); - fprintf(stderr, - " InnoDB: !!!!!!!! UNIV_MEM_DEBUG switched on !!!!!!!!!\n"); + ib_logf(IB_LOG_LEVEL_INFO, + " InnoDB: !!!!!!!! UNIV_MEM_DEBUG switched on !!!!!!!!!"); #endif if (srv_use_sys_malloc) { |