diff options
| author | unknown <ingo@mysql.com> | 2005-09-14 10:34:41 +0200 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2005-09-14 10:34:41 +0200 |
| commit | 683e228a26d8f8ea85e329e4f6f23ea625a85537 (patch) | |
| tree | eb958e7ee55c89b371fbc7915546d88758ee10b2 /myisam/mi_test2.c | |
| parent | 1d175fd9b92e7f4d774f3f59f867f8d0e4d311d3 (diff) | |
| parent | 07b61cbb251d7b233abc47b4dd235930fbe4af63 (diff) | |
| download | mariadb-git-683e228a26d8f8ea85e329e4f6f23ea625a85537.tar.gz | |
Merge mysql.com:/home/mydev/mysql-4.0-4000
into mysql.com:/home/mydev/mysql-4.1-4100
include/my_sys.h:
Bug#12920 - key_read_requests counter appears to re-set
Manual merge requiring after merge fix.
myisam/mi_test2.c:
Bug#12920 - key_read_requests counter appears to re-set
Manual merge requiring after merge fix.
mysys/mf_keycache.c:
Bug#12920 - key_read_requests counter appears to re-set
Manual merge requiring after merge fix.
sql/mysqld.cc:
Bug#12920 - key_read_requests counter appears to re-set
Manual merge requiring after merge fix.
sql/sql_test.cc:
Bug#12920 - key_read_requests counter appears to re-set
Manual merge requiring after merge fix.
Diffstat (limited to 'myisam/mi_test2.c')
| -rw-r--r-- | myisam/mi_test2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/myisam/mi_test2.c b/myisam/mi_test2.c index 95c8ce56a13..d43600d9f66 100644 --- a/myisam/mi_test2.c +++ b/myisam/mi_test2.c @@ -834,14 +834,14 @@ end: #if 0 printf("key cache status: \n\ blocks used:%10lu\n\ +not flushed:%10lu\n\ w_requests: %10lu\n\ writes: %10lu\n\ r_requests: %10lu\n\ reads: %10lu\n", - my_blocks_used, - my_cache_w_requests, my_cache_write, - my_cache_r_requests, my_cache_read); -#endif + my_blocks_used, my_blocks_changed, + (ulong) my_cache_w_requests, (ulong) my_cache_write, + (ulong) my_cache_r_requests, (ulong) my_cache_read); } end_key_cache(dflt_key_cache,1); if (blob_buffer) |