mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-04-13 10:45:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions1

Merge remote-tracking branch 'github/10.1' into 10.1

Browse source
This commit is contained in:
Sergei Golubchik 2015-06-01 16:01:42 +02:00
commit d602574542
6 changed files with 47 additions and 66 deletions
mysql-test
mysql-test-run.pl
sql
log.cc
storage
innobase
buf
buf0dump.cc
srv
srv0start.cc
xtradb
buf
buf0dump.cc
srv
srv0start.cc

2
mysql-test/mysql-test-run.pl
View file

@ -4372,6 +4372,8 @@ sub extract_warning_lines ($$) {
qr/InnoDB: Warning: a long semaphore wait:/,
qr/InnoDB: Disabling redo log encryption/,
qr/InnoDB: Redo log crypto: Can't initialize to key version -1u/,
qr/InnoDB: Dumping buffer pool.*/,
qr/InnoDB: Buffer pool.*/,
qr/Slave: Unknown table 't1' .* 1051/,
qr/Slave SQL:.*(Internal MariaDB error code: [[:digit:]]+|Query:.*)/,
qr/slave SQL thread aborted/,

5
sql/log.cc
View file

@ -8282,13 +8282,14 @@ static void print_buffer_to_file(enum loglevel level, const char *buffer,
localtime_r(&skr, &tm_tmp);
start=&tm_tmp;
fprintf(stderr, "%02d%02d%02d %2d:%02d:%02d [%s] %.*s%.*s\n",
start->tm_year % 100,
fprintf(stderr, "%d-%02d-%02d %2d:%02d:%02d %lu [%s] %.*s%.*s\n",
start->tm_year + 1900,
start->tm_mon+1,
start->tm_mday,
start->tm_hour,
start->tm_min,
start->tm_sec,
(unsigned long) pthread_self(),
(level == ERROR_LEVEL ? "ERROR" : level == WARNING_LEVEL ?
"Warning" : "Note"),
tag_length, tag,

6
storage/innobase/buf/buf0dump.cc
View file

@ -123,11 +123,7 @@ buf_dump_status(
sizeof(export_vars.innodb_buffer_pool_dump_status),
fmt, ap);
if (severity == STATUS_NOTICE || severity == STATUS_ERR) {
ut_print_timestamp(stderr);
fprintf(stderr, " InnoDB: %s\n",
export_vars.innodb_buffer_pool_dump_status);
}
ib_logf((ib_log_level_t) severity, "%s", export_vars.innodb_buffer_pool_dump_status);
va_end(ap);
}

47
storage/innobase/srv/srv0start.cc
View file

@ -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) {

6
storage/xtradb/buf/buf0dump.cc
View file

@ -123,11 +123,7 @@ buf_dump_status(
sizeof(export_vars.innodb_buffer_pool_dump_status),
fmt, ap);
if (severity == STATUS_NOTICE || severity == STATUS_ERR) {
ut_print_timestamp(stderr);
fprintf(stderr, " InnoDB: %s\n",
export_vars.innodb_buffer_pool_dump_status);
}
ib_logf((ib_log_level_t) severity, "%s", export_vars.innodb_buffer_pool_dump_status);
va_end(ap);
}

47
storage/xtradb/srv/srv0start.cc
View file

@ -522,7 +522,8 @@ DECLARE_THREAD(io_handler_thread)(
os_thread_set_priority(srv_io_tids[tid_i], srv_sched_priority_io);
#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
@ -1698,53 +1699,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) {