mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-07 23:54:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge mysql.com:/home/mydev/mysql-4.1-4100

Browse source 
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
commit a150392317
8 changed files with 40 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

12
myisam/mi_test2.c
View file

@ -831,17 +831,19 @@ end:
puts("Locking used");
if (use_blob)
puts("blobs used");
#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
dflt_key_cache->blocks_used,
dflt_key_cache->global_blocks_changed,
(ulong) dflt_key_cache->global_cache_w_requests,
(ulong) dflt_key_cache->global_cache_write,
(ulong) dflt_key_cache->global_cache_r_requests,
(ulong) dflt_key_cache->global_cache_read);
}
end_key_cache(dflt_key_cache,1);
if (blob_buffer)