Commit 683e228a authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/mydev/mysql-4.0-4000 

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


include/my_sys.h:
  Bug#12920 - key_read_requests counter appears to re-set
  Manual merge requiring after merge fix.
myisam/mi_test2.c:
  Bug#12920 - key_read_requests counter appears to re-set
  Manual merge requiring after merge fix.
mysys/mf_keycache.c:
  Bug#12920 - key_read_requests counter appears to re-set
  Manual merge requiring after merge fix.
sql/mysqld.cc:
  Bug#12920 - key_read_requests counter appears to re-set
  Manual merge requiring after merge fix.
sql/sql_test.cc:
  Bug#12920 - key_read_requests counter appears to re-set
  Manual merge requiring after merge fix.
parents 1d175fd9 07b61cbb

include/my_sys.h

+2 −2
Original line number Diff line number Diff line
@@ -216,8 +216,8 @@ 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 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 ulong	my_file_opened,my_stream_opened, my_tmp_file_created;

extern uint	mysys_usage_id;

myisam/mi_test2.c

+4 −4
Original line number Diff line number Diff line
@@ -834,14 +834,14 @@ int main(int argc, char *argv[]) 
#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

           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(dflt_key_cache,1);

  if (blob_buffer)