Commit e21ed0a8 authored by Mikael Ronstrom's avatar Mikael Ronstrom

Fixed more compiler warnings

parents 11591608 96263b1d
...@@ -4403,9 +4403,9 @@ os_aio_print( ...@@ -4403,9 +4403,9 @@ os_aio_print(
putc('\n', file); putc('\n', file);
fprintf(file, fprintf(file,
"Summary of background IO slot status: %lu issued, " "Summary of background IO slot status: %lu issued, "
"%lu done, %lu claimed, sleep set %u\n", "%lu done, %lu claimed, sleep set %d\n",
num_issued, num_done, num_claimed, num_issued, num_done, num_claimed,
os_aio_recommend_sleep_for_read_threads); (int)os_aio_recommend_sleep_for_read_threads);
putc('\n', file); putc('\n', file);
current_time = time(NULL); current_time = time(NULL);
......
...@@ -706,7 +706,9 @@ srv_print_extra( ...@@ -706,7 +706,9 @@ srv_print_extra(
(double) srv_thread_wait_mics / 1000000.0); (double) srv_thread_wait_mics / 1000000.0);
fprintf(file, fprintf(file,
"spinlock delay for %d delay %d rounds is %lld mics\n", "spinlock delay for %d delay %d rounds is %lld mics\n",
srv_spin_wait_delay, SYNC_SPIN_ROUNDS, srv_timed_spin_delay); (int)srv_spin_wait_delay,
(int)SYNC_SPIN_ROUNDS,
srv_timed_spin_delay);
} }
/************************************************************************* /*************************************************************************
......
...@@ -1251,8 +1251,10 @@ innobase_start_or_create_for_mysql(void) ...@@ -1251,8 +1251,10 @@ innobase_start_or_create_for_mysql(void)
/* Restrict the maximum number of file i/o threads */ /* Restrict the maximum number of file i/o threads */
if ((srv_n_read_io_threads + srv_n_write_io_threads) > SRV_MAX_N_IO_THREADS) { if ((srv_n_read_io_threads + srv_n_write_io_threads) > SRV_MAX_N_IO_THREADS) {
fprintf(stderr, fprintf(stderr,
"InnoDB: requested too many read(%u) or write(%u) IO threads, max is %d\n", "InnoDB: requested too many read(%d) or write(%d) IO threads, max is %d\n",
srv_n_read_io_threads, srv_n_write_io_threads, SRV_MAX_N_IO_THREADS); (int)srv_n_read_io_threads,
(int)srv_n_write_io_threads,
SRV_MAX_N_IO_THREADS);
return(DB_ERROR); return(DB_ERROR);
} }
...@@ -1272,8 +1274,8 @@ innobase_start_or_create_for_mysql(void) ...@@ -1272,8 +1274,8 @@ innobase_start_or_create_for_mysql(void)
if (n_threads > SRV_MAX_N_IO_THREADS) { if (n_threads > SRV_MAX_N_IO_THREADS) {
fprintf(stderr, fprintf(stderr,
"InnoDB: requested too many IO threads(%u), max is %d\n", "InnoDB: requested too many IO threads(%d), max is %d\n",
n_threads, SRV_MAX_N_IO_THREADS); (int)n_threads, SRV_MAX_N_IO_THREADS);
return(DB_ERROR); return(DB_ERROR);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment