Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


configure.in:
  Auto merged
include/my_global.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
storage/myisam/mi_test2.c:
  Auto merged

1 files changed, 7 insertions, 5 deletions

diff --git a/storage/myisam/mi_test2.c b/storage/myisam/mi_test2.c
index 95c8ce56a13..6a6dcb971a2 100644
--- a/storage/myisam/mi_test2.c
+++ b/storage/myisam/mi_test2.c
@@ -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)