bk commit into 4.0 tree (ingo:1.2144) BUG#12920

[ingo]

Below is the list of changes that have just been committed into a local
4.0 repository of mydev. When mydev does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2144 05/09/02 11:46:36 ingo@stripped +5 -0
  Bug#12920 - key_read_requests counter appears to re-set
  Enlarged the counter variables to ulonglong.

  sql/sql_test.cc
    1.16 05/09/02 11:46:34 ingo@stripped +3 -2
    Bug#12920 - key_read_requests counter appears to re-set
    Enlarged the counter variables to ulonglong.

  sql/mysqld.cc
    1.528 05/09/02 11:46:34 ingo@stripped +4 -4
    Bug#12920 - key_read_requests counter appears to re-set
    Enlarged the counter variables to ulonglong.

  mysys/mf_keycache.c
    1.24 05/09/02 11:46:34 ingo@stripped +7 -5
    Bug#12920 - key_read_requests counter appears to re-set
    Enlarged the counter variables to ulonglong.

  myisam/mi_test2.c
    1.18 05/09/02 11:46:34 ingo@stripped +4 -2
    Bug#12920 - key_read_requests counter appears to re-set
    Enlarged the counter variables to ulonglong.

  include/my_sys.h
    1.112 05/09/02 11:46:33 ingo@stripped +2 -2
    Bug#12920 - key_read_requests counter appears to re-set
    Enlarged the counter variables to ulonglong.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	ingo
# Host:	chilla.local
# Root:	/home/mydev/mysql-4.0-4000

--- 1.111/include/my_sys.h	2005-03-04 10:22:48 +01:00
+++ 1.112/include/my_sys.h	2005-09-02 11:46:33 +02:00
@@ -222,8 +222,8 @@
 
 
 /* statistics */
-extern ulong	_my_cache_w_requests,_my_cache_write,_my_cache_r_requests,
-		_my_cache_read;
+extern ulonglong    _my_cache_w_requests, _my_cache_write;
+extern ulonglong    _my_cache_r_requests, _my_cache_read;
 extern ulong	_my_blocks_used,_my_blocks_changed;
 extern uint	key_cache_block_size;
 extern ulong	my_file_opened,my_stream_opened, my_tmp_file_created;

--- 1.17/myisam/mi_test2.c	2003-11-17 12:06:28 +01:00
+++ 1.18/myisam/mi_test2.c	2005-09-02 11:46:34 +02:00
@@ -812,12 +812,14 @@
       puts("blobs used");
     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);
+           _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();
   if (blob_buffer)

--- 1.23/mysys/mf_keycache.c	2003-11-17 12:06:28 +01:00
+++ 1.24/mysys/mf_keycache.c	2005-09-02 11:46:34 +02:00
@@ -62,8 +62,8 @@
 static uint	_my_disk_blocks_used, _my_hash_blocks;
 static uint	key_cache_shift;
 ulong		_my_blocks_used,_my_blocks_changed;
-ulong		_my_cache_w_requests,_my_cache_write,_my_cache_r_requests,
-		_my_cache_read;
+ulonglong       _my_cache_w_requests, _my_cache_write;
+ulonglong       _my_cache_r_requests, _my_cache_read;
 uint		key_cache_block_size=DEFAULT_KEYCACHE_BLOCK_SIZE;
 static byte	HUGE_PTR *_my_block_mem;
 static SEC_LINK *changed_blocks[CHANGED_BLOCKS_HASH];
@@ -192,9 +192,11 @@
   key_cache_inited=0;
   _my_hash_blocks=_my_blocks_used=0;
   DBUG_PRINT("status",
-	     ("used: %d  changed: %d  w_requests: %ld  writes: %ld  r_requests: %ld  reads:
%ld",
-	      _my_blocks_used,_my_blocks_changed,_my_cache_w_requests,
-	      _my_cache_write,_my_cache_r_requests,_my_cache_read));
+	     ("used: %d  changed: %d  w_requests: %lu  writes: %lu  "
+              "r_requests: %lu  reads: %lu",
+	      _my_blocks_used, _my_blocks_changed,
+              (ulong) _my_cache_w_requests, (ulong) _my_cache_write,
+              (ulong) _my_cache_r_requests, (ulong) _my_cache_read));
   DBUG_VOID_RETURN;
 } /* end_key_cache */
 

--- 1.527/sql/mysqld.cc	2005-08-28 05:00:19 +02:00
+++ 1.528/sql/mysqld.cc	2005-09-02 11:46:34 +02:00
@@ -4532,10 +4532,10 @@
   {"Handler_update",           (char*) &ha_update_count,        SHOW_LONG},
   {"Handler_write",            (char*) &ha_write_count,         SHOW_LONG},
   {"Key_blocks_used",          (char*) &_my_blocks_used,        SHOW_LONG_CONST},
-  {"Key_read_requests",        (char*) &_my_cache_r_requests,   SHOW_LONG},
-  {"Key_reads",                (char*) &_my_cache_read,         SHOW_LONG},
-  {"Key_write_requests",       (char*) &_my_cache_w_requests,   SHOW_LONG},
-  {"Key_writes",               (char*) &_my_cache_write,        SHOW_LONG},
+  {"Key_read_requests",        (char*) &_my_cache_r_requests,   SHOW_LONGLONG},
+  {"Key_reads",                (char*) &_my_cache_read,         SHOW_LONGLONG},
+  {"Key_write_requests",       (char*) &_my_cache_w_requests,   SHOW_LONGLONG},
+  {"Key_writes",               (char*) &_my_cache_write,        SHOW_LONGLONG},
   {"Max_used_connections",     (char*) &max_used_connections,   SHOW_LONG},
   {"Not_flushed_delayed_rows", (char*) &delayed_rows_in_use,    SHOW_LONG_CONST},
   {"Not_flushed_key_blocks",   (char*) &_my_blocks_changed,     SHOW_LONG_CONST},

--- 1.15/sql/sql_test.cc	2003-10-16 19:55:10 +02:00
+++ 1.16/sql/sql_test.cc	2005-09-02 11:46:34 +02:00
@@ -219,8 +219,9 @@
 writes:     %10lu\n\
 r_requests: %10lu\n\
 reads:      %10lu\n",
-	 _my_blocks_used,_my_blocks_changed,_my_cache_w_requests,
-	 _my_cache_write,_my_cache_r_requests,_my_cache_read);
+         _my_blocks_used, _my_blocks_changed,
+         (ulong) _my_cache_w_requests, (ulong) _my_cache_write,
+         (ulong) _my_cache_r_requests, (ulong) _my_cache_read);
   pthread_mutex_unlock(&THR_LOCK_keycache);
 
   if (thd)