1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
unknown 2005-09-14 10:34:41 +02:00
commit 683e228a26
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/my_sys.h
View File

@ -216,8 +216,8 @@ extern CHARSET_INFO *all_charsets[256];
extern CHARSET_INFO compiled_charsets[]; extern CHARSET_INFO compiled_charsets[];
/* statistics */ /* statistics */
extern ulong my_cache_w_requests, my_cache_write, my_cache_r_requests, extern ulonglong my_cache_w_requests, my_cache_write;
my_cache_read; extern ulonglong my_cache_r_requests, my_cache_read;
extern ulong my_blocks_used, my_blocks_changed; extern ulong my_blocks_used, my_blocks_changed;
extern ulong my_file_opened,my_stream_opened, my_tmp_file_created; extern ulong my_file_opened,my_stream_opened, my_tmp_file_created;
extern uint mysys_usage_id; extern uint mysys_usage_id;

8
myisam/mi_test2.c
View File

@ -834,14 +834,14 @@ end:
#if 0 #if 0
printf("key cache status: \n\ printf("key cache status: \n\
blocks used:%10lu\n\ blocks used:%10lu\n\
not flushed:%10lu\n\
w_requests: %10lu\n\ w_requests: %10lu\n\
writes: %10lu\n\ writes: %10lu\n\
r_requests: %10lu\n\ r_requests: %10lu\n\
reads: %10lu\n", reads: %10lu\n",
my_blocks_used, my_blocks_used, my_blocks_changed,
my_cache_w_requests, my_cache_write, (ulong) my_cache_w_requests, (ulong) my_cache_write,
my_cache_r_requests, my_cache_read); (ulong) my_cache_r_requests, (ulong) my_cache_read);
#endif
} }
end_key_cache(dflt_key_cache,1); end_key_cache(dflt_key_cache,1);
if (blob_buffer) if (blob_buffer)