diff options
| author | unknown <ingo@mysql.com> | 2005-09-14 13:37:16 +0200 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2005-09-14 13:37:16 +0200 |
| commit | a1503923177ff2bebe64b3d4d3b40264ff6c4fd0 (patch) | |
| tree | ae2fd0258faa8a659833fd8a79ec66c3c11e5e83 /include | |
| parent | a3f87ca4c73e225e828487f2f22bdb24210aa83c (diff) | |
| parent | 5fe65297d21ed815d221699cad46e44958f74a06 (diff) | |
| download | mariadb-git-a1503923177ff2bebe64b3d4d3b40264ff6c4fd0.tar.gz | |
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.
Diffstat (limited to 'include')
| -rw-r--r-- | include/keycache.h | 8 | ||||
| -rw-r--r-- | include/my_sys.h | 3 |
2 files changed, 4 insertions, 7 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; |