mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-10 17:14:30 +02:00
Code Issues Projects Releases Packages Wiki Activity

Manual-merge from mysql-5.1-bugteam.

Browse source
This commit is contained in:
Ramil Kalimullin 2010-11-22 12:21:10 +03:00
commit 65116d3408
53 changed files with 2271 additions and 1165 deletions
Download patch file Download diff file Expand all files Collapse all files

22
storage/innobase/srv/srv0start.c
View file

@ -1247,6 +1247,23 @@ innobase_start_or_create_for_mysql(void)
fil_init(srv_max_n_open_files);
/* Print time to initialize the buffer pool */
ut_print_timestamp(stderr);
fprintf(stderr,
" InnoDB: Initializing buffer pool, size =");
if (srv_pool_size * UNIV_PAGE_SIZE >= 1024 * 1024 * 1024) {
fprintf(stderr,
" %.1fG\n",
((double) (srv_pool_size * UNIV_PAGE_SIZE))
/ (1024 * 1024 * 1024));
} else {
fprintf(stderr,
" %.1fM\n",
((double) (srv_pool_size * UNIV_PAGE_SIZE))
/ (1024 * 1024));
}
if (srv_use_awe) {
fprintf(stderr,
"InnoDB: Using AWE: Memory window is %lu MB"
@ -1267,6 +1284,8 @@ innobase_start_or_create_for_mysql(void)
srv_pool_size);
}
ut_print_timestamp(stderr);
if (ret == NULL) {
fprintf(stderr,
"InnoDB: Fatal error: cannot allocate the memory"
@ -1275,6 +1294,9 @@ innobase_start_or_create_for_mysql(void)
return(DB_ERROR);
}
fprintf(stderr,
" InnoDB: Completed initialization of buffer pool\n");
fsp_init();
log_init();

2
storage/innobase/sync/sync0rw.c
View file

@ -888,7 +888,7 @@ rw_lock_debug_print(
rwt = info->lock_type;
fprintf(stderr, "Locked: thread %ld file %s line %ld ",
fprintf(stderr, "Locked: thread %lu file %s line %lu ",
(ulong) os_thread_pf(info->thread_id), info->file_name,
(ulong) info->line);
if (rwt == RW_LOCK_SHARED) {