diff options
| author | unknown <ingo@mysql.com> | 2005-09-14 13:37:16 +0200 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2005-09-14 13:37:16 +0200 |
| commit | a1503923177ff2bebe64b3d4d3b40264ff6c4fd0 (patch) | |
| tree | ae2fd0258faa8a659833fd8a79ec66c3c11e5e83 /mysys | |
| parent | a3f87ca4c73e225e828487f2f22bdb24210aa83c (diff) | |
| parent | 5fe65297d21ed815d221699cad46e44958f74a06 (diff) | |
| download | mariadb-git-a1503923177ff2bebe64b3d4d3b40264ff6c4fd0.tar.gz | |
Merge mysql.com:/home/mydev/mysql-4.1-4100
into mysql.com:/home/mydev/mysql-5.0-5000
include/my_sys.h:
Auto merged
mysys/mf_keycache.c:
Auto merged
sql/sql_test.cc:
Auto merged
sql/mysqld.cc:
Manual merge.
sql/sql_show.cc:
Manual merge.
sql/structs.h:
Manual merge.
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/mf_keycache.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/mysys/mf_keycache.c b/mysys/mf_keycache.c index cb2e0c98e8a..a86b6a2f1f4 100644 --- a/mysys/mf_keycache.c +++ b/mysys/mf_keycache.c @@ -632,12 +632,13 @@ void end_key_cache(KEY_CACHE *keycache, my_bool cleanup) keycache->blocks_changed= 0; } - DBUG_PRINT("status", - ("used: %d changed: %d w_requests: %ld \ -writes: %ld r_requests: %ld reads: %ld", - keycache->blocks_used, keycache->global_blocks_changed, - keycache->global_cache_w_requests, keycache->global_cache_write, - keycache->global_cache_r_requests, keycache->global_cache_read)); + DBUG_PRINT("status", ("used: %d changed: %d w_requests: %lu " + "writes: %lu r_requests: %lu reads: %lu", + keycache->blocks_used, keycache->global_blocks_changed, + (ulong) keycache->global_cache_w_requests, + (ulong) keycache->global_cache_write, + (ulong) keycache->global_cache_r_requests, + (ulong) keycache->global_cache_read)); if (cleanup) { |