diff options
| author | unknown <ingo@mysql.com> | 2005-09-14 10:34:41 +0200 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2005-09-14 10:34:41 +0200 |
| commit | 683e228a26d8f8ea85e329e4f6f23ea625a85537 (patch) | |
| tree | eb958e7ee55c89b371fbc7915546d88758ee10b2 /include | |
| parent | 1d175fd9b92e7f4d774f3f59f867f8d0e4d311d3 (diff) | |
| parent | 07b61cbb251d7b233abc47b4dd235930fbe4af63 (diff) | |
| download | mariadb-git-683e228a26d8f8ea85e329e4f6f23ea625a85537.tar.gz | |
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.
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_sys.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index 8752aa30772..01a8b92571b 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -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; |