diff options
| author | igor@rurik.mysql.com <> | 2003-06-12 06:22:35 -0700 |
|---|---|---|
| committer | igor@rurik.mysql.com <> | 2003-06-12 06:22:35 -0700 |
| commit | a0f3dcc3c8e67f7265d5da216c776312e5242273 (patch) | |
| tree | 148b8c692128d7dcdb3d773ae94f069f283fce24 /include | |
| parent | f928a0c499c015bcbb84a6c9a96106126a6e3595 (diff) | |
| parent | 1e5dec8cf838510d6409501ca337ca087e3f0a0a (diff) | |
| download | mariadb-git-a0f3dcc3c8e67f7265d5da216c776312e5242273.tar.gz | |
Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_base.h | 4 | ||||
| -rw-r--r-- | include/my_sys.h | 2 | ||||
| -rw-r--r-- | include/myisam.h | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/include/my_base.h b/include/my_base.h index ac41d9e50ef..8c5496cc2e0 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -123,7 +123,8 @@ enum ha_extra_function { HA_EXTRA_NO_IGNORE_DUP_KEY, HA_EXTRA_DONT_USE_CURSOR_TO_UPDATE, /* Cursor will not be used for update */ HA_EXTRA_PREPARE_FOR_DELETE, - HA_EXTRA_PREPARE_FOR_UPDATE /* Remove read cache if problems */ + HA_EXTRA_PREPARE_FOR_UPDATE, /* Remove read cache if problems */ + HA_EXTRA_PRELOAD_BUFFER_SIZE /* Set buffer size for preloading */ }; /* The following is parameter to ha_panic() */ @@ -256,6 +257,7 @@ enum ha_base_keytype { #define HA_ERR_CANNOT_ADD_FOREIGN 150 /* Cannot add a foreign key constr. */ #define HA_ERR_NO_REFERENCED_ROW 151 /* Cannot add a child row */ #define HA_ERR_ROW_IS_REFERENCED 152 /* Cannot delete a parent row */ +#define HA_ERR_NON_UNIQUE_BLOCK_SIZE 153 /* Non unique key block size */ /* Other constants */ diff --git a/include/my_sys.h b/include/my_sys.h index b4fc20e8471..48ebdc22f37 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -643,6 +643,8 @@ extern int init_key_cache(ulong use_mem); extern int resize_key_cache(ulong use_mem); extern byte *key_cache_read(File file,my_off_t filepos,byte* buff,uint length, uint block_length,int return_buffer); +extern int key_cache_insert(File file, my_off_t filepos, + byte *buff, uint length); extern int key_cache_write(File file,my_off_t filepos,byte* buff,uint length, uint block_length,int force_write); extern int flush_key_blocks(int file, enum flush_type type); diff --git a/include/myisam.h b/include/myisam.h index 33aa6aa3f31..e85d3057672 100644 --- a/include/myisam.h +++ b/include/myisam.h @@ -410,6 +410,7 @@ my_bool mi_test_if_sort_rep(MI_INFO *info, ha_rows rows, ulonglong key_map, int mi_init_bulk_insert(MI_INFO *info, ulong cache_size, ha_rows rows); void mi_flush_bulk_insert(MI_INFO *info, uint inx); void mi_end_bulk_insert(MI_INFO *info); +int mi_preload(MI_INFO *info, ulonglong key_map, my_bool ignore_leaves); #ifdef __cplusplus } |