diff options
| author | Mikael Ronstrom <mikael@mysql.com> | 2008-10-17 13:43:34 +0200 |
|---|---|---|
| committer | Mikael Ronstrom <mikael@mysql.com> | 2008-10-17 13:43:34 +0200 |
| commit | 94e46a01711ca420d3bb37ff3d4b97eb92d04a8d (patch) | |
| tree | 039f3c1d74b8bb00e7a0ccc753ab9d9c584f5c8a /storage/innobase | |
| parent | 27046be12f2810f22dfe695cb54d70cde497978b (diff) | |
| download | mariadb-git-94e46a01711ca420d3bb37ff3d4b97eb92d04a8d.tar.gz | |
Fixed compiler warnings
Diffstat (limited to 'storage/innobase')
| -rw-r--r-- | storage/innobase/os/os0file.c | 4 | ||||
| -rw-r--r-- | storage/innobase/srv/srv0srv.c | 4 | ||||
| -rw-r--r-- | storage/innobase/srv/srv0start.c | 10 |
3 files changed, 11 insertions, 7 deletions
diff --git a/storage/innobase/os/os0file.c b/storage/innobase/os/os0file.c index 88884dcb2fd..2907fddc33b 100644 --- a/storage/innobase/os/os0file.c +++ b/storage/innobase/os/os0file.c @@ -4403,9 +4403,9 @@ loop: putc('\n', file); fprintf(file, "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, - os_aio_recommend_sleep_for_read_threads); + (int)os_aio_recommend_sleep_for_read_threads); putc('\n', file); current_time = time(NULL); diff --git a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c index 44d59d060d7..9ae821182bf 100644 --- a/storage/innobase/srv/srv0srv.c +++ b/storage/innobase/srv/srv0srv.c @@ -706,7 +706,9 @@ srv_print_extra( (double) srv_thread_wait_mics / 1000000.0); fprintf(file, "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); } /************************************************************************* diff --git a/storage/innobase/srv/srv0start.c b/storage/innobase/srv/srv0start.c index 86cbf15a5df..41b0cd0fcd9 100644 --- a/storage/innobase/srv/srv0start.c +++ b/storage/innobase/srv/srv0start.c @@ -1251,8 +1251,10 @@ innobase_start_or_create_for_mysql(void) /* 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) { fprintf(stderr, - "InnoDB: requested too many read(%u) or write(%u) IO threads, max is %d\n", - srv_n_read_io_threads, srv_n_write_io_threads, SRV_MAX_N_IO_THREADS); + "InnoDB: requested too many read(%d) or write(%d) IO threads, max is %d\n", + (int)srv_n_read_io_threads, + (int)srv_n_write_io_threads, + SRV_MAX_N_IO_THREADS); return(DB_ERROR); } @@ -1272,8 +1274,8 @@ innobase_start_or_create_for_mysql(void) if (n_threads > SRV_MAX_N_IO_THREADS) { fprintf(stderr, - "InnoDB: requested too many IO threads(%u), max is %d\n", - n_threads, SRV_MAX_N_IO_THREADS); + "InnoDB: requested too many IO threads(%d), max is %d\n", + (int)n_threads, SRV_MAX_N_IO_THREADS); return(DB_ERROR); } |