1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

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.
This commit is contained in:
unknown
2005-09-14 13:37:16 +02:00
8 changed files with 40 additions and 29 deletions

View File

@ -408,6 +408,11 @@ end:
static int print_key_cache_status(const char *name, KEY_CACHE *key_cache)
{
char llbuff1[22];
char llbuff2[22];
char llbuff3[22];
char llbuff4[22];
if (!key_cache->key_cache_inited)
{
printf("%s: Not in use\n", name);
@ -421,16 +426,18 @@ Division_limit: %10lu\n\
Age_limit: %10lu\n\
blocks used: %10lu\n\
not flushed: %10lu\n\
w_requests: %10lu\n\
writes: %10lu\n\
r_requests: %10lu\n\
reads: %10lu\n\n",
w_requests: %10s\n\
writes: %10s\n\
r_requests: %10s\n\
reads: %10s\n\n",
name,
(ulong) key_cache->param_buff_size, key_cache->param_block_size,
key_cache->param_division_limit, key_cache->param_age_threshold,
key_cache->blocks_used,key_cache->global_blocks_changed,
key_cache->global_cache_w_requests,key_cache->global_cache_write,
key_cache->global_cache_r_requests,key_cache->global_cache_read);
llstr(key_cache->global_cache_w_requests,llbuff1),
llstr(key_cache->global_cache_write,llbuff2),
llstr(key_cache->global_cache_r_requests,llbuff3),
llstr(key_cache->global_cache_read,llbuff4));
}
return 0;
}