diff options
| author | monty@mysql.com <> | 2005-01-15 14:09:45 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2005-01-15 14:09:45 +0200 |
| commit | 0a1076a25f897e4c383cdc5be6b713e65077496b (patch) | |
| tree | e8856cd37d5a43bd18c06a8834fbfff83c0f4998 /include | |
| parent | 97b28521e6f2735ee6488682b15071f604f66cfd (diff) | |
| parent | f34bc883ab4beda7ffd295a89ba62a30f8ccc0e5 (diff) | |
| download | mariadb-git-0a1076a25f897e4c383cdc5be6b713e65077496b.tar.gz | |
Merge with 4.1
Diffstat (limited to 'include')
| -rw-r--r-- | include/heap.h | 7 | ||||
| -rw-r--r-- | include/my_sys.h | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/include/heap.h b/include/heap.h index 5e83a6e2cb5..ac2b38d1f2d 100644 --- a/include/heap.h +++ b/include/heap.h @@ -125,8 +125,8 @@ typedef struct st_hp_keydef /* Key definition with open */ TREE rb_tree; int (*write_key)(struct st_heap_info *info, struct st_hp_keydef *keyinfo, const byte *record, byte *recpos); - int (*delete_key)(struct st_heap_info *info, struct st_hp_keydef *keyinfo, - const byte *record, byte *recpos, int flag); + int (*delete_key)(struct st_heap_info *info, struct st_hp_keydef *keyinfo, + const byte *record, byte *recpos, int flag); uint (*get_key_length)(struct st_hp_keydef *keydef, const byte *key); } HP_KEYDEF; @@ -135,7 +135,7 @@ typedef struct st_heap_share HP_BLOCK block; HP_KEYDEF *keydef; ulong min_records,max_records; /* Params to open */ - ulong data_length,index_length; + ulong data_length,index_length,max_table_size; uint records; /* records */ uint blength; /* records rounded up to 2^n */ uint deleted; /* Deleted records in database */ @@ -185,6 +185,7 @@ typedef struct st_heap_create_info { uint auto_key; uint auto_key_type; + ulong max_table_size; ulonglong auto_increment; } HP_CREATE_INFO; diff --git a/include/my_sys.h b/include/my_sys.h index 5b0390c7d72..d11dc4a3e46 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -688,6 +688,7 @@ extern int init_io_cache(IO_CACHE *info,File file,uint cachesize, extern my_bool reinit_io_cache(IO_CACHE *info,enum cache_type type, my_off_t seek_offset,pbool use_async_io, pbool clear_cache); +extern void setup_io_cache(IO_CACHE* info); extern int _my_b_read(IO_CACHE *info,byte *Buffer,uint Count); #ifdef THREAD extern int _my_b_read_r(IO_CACHE *info,byte *Buffer,uint Count); |