diff options
| author | igor@rurik.mysql.com <> | 2003-07-16 13:35:34 -0700 |
|---|---|---|
| committer | igor@rurik.mysql.com <> | 2003-07-16 13:35:34 -0700 |
| commit | 26ecd865391c2b7b5ccd65bc0e66264ce7c5bac4 (patch) | |
| tree | 7cda3f32b4df3b70ba418601d183b2f3265e1fff /include/my_sys.h | |
| parent | 42e1296e9d83b8299fe6c8391ece71e88c7019c1 (diff) | |
| parent | a35fff5bc38732d48472a64a4504bcead010a379 (diff) | |
| download | mariadb-git-26ecd865391c2b7b5ccd65bc0e66264ce7c5bac4.tar.gz | |
Conflict resolution
Diffstat (limited to 'include/my_sys.h')
| -rw-r--r-- | include/my_sys.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index 7f4d0e0e62f..dae7f3d4a11 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -503,6 +503,12 @@ my_off_t my_b_append_tell(IO_CACHE* info); #define my_b_bytes_in_cache(info) (uint) (*(info)->current_end - \ *(info)->current_pos) +/* key_cache_variables */ +typedef struct st_keycache +{ + ulonglong size; +} KEY_CACHE; + #include <my_alloc.h> /* Prototypes for mysys and my_func functions */ |