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.

8 files changed, 40 insertions, 29 deletions

diff --git a/include/keycache.h b/include/keycache.h
index a292a69b0a3..9fe1cce5da5 100644
--- a/include/keycache.h
+++ b/include/keycache.h
@@ -90,10 +90,10 @@ typedef struct st_key_cache
 
   /* Statistics variables. These are reset in reset_key_cache_counters(). */
   ulong global_blocks_changed;	/* number of currently dirty blocks         */
-  ulong global_cache_w_requests;/* number of write requests (write hits)    */
-  ulong global_cache_write;     /* number of writes from the cache to files */
-  ulong global_cache_r_requests;/* number of read requests (read hits)      */
-  ulong global_cache_read;      /* number of reads from files to the cache  */
+  ulonglong global_cache_w_requests;/* number of write requests (write hits) */
+  ulonglong global_cache_write;     /* number of writes from cache to files  */
+  ulonglong global_cache_r_requests;/* number of read requests (read hits)   */
+  ulonglong global_cache_read;      /* number of reads from files to cache   */
 
   int blocks;                   /* max number of blocks in the cache        */
   my_bool in_init;		/* Set to 1 in MySQL during init/resize     */
diff --git a/include/my_sys.h b/include/my_sys.h
index c46da655fa4..836b2a85528 100644
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -237,9 +237,6 @@ extern CHARSET_INFO *all_charsets[256];
 extern CHARSET_INFO compiled_charsets[];
 
 /* statistics */
-extern ulong	my_cache_w_requests, my_cache_write, my_cache_r_requests,
-		my_cache_read;
-extern ulong	my_blocks_used, my_blocks_changed;
 extern ulong	my_file_opened,my_stream_opened, my_tmp_file_created;
 extern uint	mysys_usage_id;
 extern my_bool	my_init_done;
diff --git a/myisam/mi_test2.c b/myisam/mi_test2.c
index 95c8ce56a13..6a6dcb971a2 100644
--- a/myisam/mi_test2.c
+++ b/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)
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)
   {
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index f7e9b21076e..a28ae38c675 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -5880,10 +5880,10 @@ struct show_var_st status_vars[]= {
   {"Key_blocks_not_flushed",   (char*) &dflt_key_cache_var.global_blocks_changed, SHOW_KEY_CACHE_LONG},
   {"Key_blocks_unused",        (char*) &dflt_key_cache_var.blocks_unused, SHOW_KEY_CACHE_CONST_LONG},
   {"Key_blocks_used",          (char*) &dflt_key_cache_var.blocks_used, SHOW_KEY_CACHE_CONST_LONG},
-  {"Key_read_requests",        (char*) &dflt_key_cache_var.global_cache_r_requests, SHOW_KEY_CACHE_LONG},
-  {"Key_reads",                (char*) &dflt_key_cache_var.global_cache_read, SHOW_KEY_CACHE_LONG},
-  {"Key_write_requests",       (char*) &dflt_key_cache_var.global_cache_w_requests, SHOW_KEY_CACHE_LONG},
-  {"Key_writes",               (char*) &dflt_key_cache_var.global_cache_write, SHOW_KEY_CACHE_LONG},
+  {"Key_read_requests",        (char*) &dflt_key_cache_var.global_cache_r_requests, SHOW_KEY_CACHE_LONGLONG},
+  {"Key_reads",                (char*) &dflt_key_cache_var.global_cache_read, SHOW_KEY_CACHE_LONGLONG},
+  {"Key_write_requests",       (char*) &dflt_key_cache_var.global_cache_w_requests, SHOW_KEY_CACHE_LONGLONG},
+  {"Key_writes",               (char*) &dflt_key_cache_var.global_cache_write, SHOW_KEY_CACHE_LONGLONG},
   {"Last_query_cost",          (char*) offsetof(STATUS_VAR, last_query_cost), SHOW_DOUBLE_STATUS},
   {"Max_used_connections",     (char*) &max_used_connections,  SHOW_LONG},
 #ifdef HAVE_NDBCLUSTER_DB
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index 821e49e288c..fc5bd4a9e10 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -1614,6 +1614,10 @@ static bool show_status_array(THD *thd, const char *wild,
           value= (value-(char*) &dflt_key_cache_var)+ (char*) dflt_key_cache;
           end= int10_to_str(*(long*) value, buff, 10);
           break;
+        case SHOW_KEY_CACHE_LONGLONG:
+	  value= (value-(char*) &dflt_key_cache_var)+ (char*) dflt_key_cache;
+	  end= longlong10_to_str(*(longlong*) value, buff, 10);
+	  break;
         case SHOW_UNDEF:				// Show never happen
         case SHOW_SYS:
           break;					// Return empty string
diff --git a/sql/sql_test.cc b/sql/sql_test.cc
index ddd0f3fe162..1bd298dda04 100644
--- a/sql/sql_test.cc
+++ b/sql/sql_test.cc
@@ -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;
 }
diff --git a/sql/structs.h b/sql/structs.h
index 03176b47360..e490a2de60c 100644
--- a/sql/structs.h
+++ b/sql/structs.h
@@ -186,7 +186,7 @@ enum SHOW_TYPE
   SHOW_SSL_GET_CIPHER_LIST,
 #endif /* HAVE_OPENSSL */
   SHOW_RPL_STATUS, SHOW_SLAVE_RUNNING, SHOW_SLAVE_RETRIED_TRANS,
-  SHOW_KEY_CACHE_LONG, SHOW_KEY_CACHE_CONST_LONG,
+  SHOW_KEY_CACHE_LONG, SHOW_KEY_CACHE_CONST_LONG, SHOW_KEY_CACHE_LONGLONG,
   SHOW_LONG_STATUS, SHOW_LONG_CONST_STATUS, SHOW_SLAVE_SKIP_ERRORS
 };