diff options
| author | monty@mashka.mysql.fi <> | 2003-01-04 15:40:55 +0200 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2003-01-04 15:40:55 +0200 |
| commit | f9772317eefe95fe8152d69593082b2864164e16 (patch) | |
| tree | 49da2620373e1b4c73d505405819d5d7097786bc /include | |
| parent | 7c82789929e36ede31dd181f54ddffd30ba7f3ed (diff) | |
| parent | 6d6f051178c7c3201c77b5fa427252d50bd5fea3 (diff) | |
| download | mariadb-git-f9772317eefe95fe8152d69593082b2864164e16.tar.gz | |
merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_base.h | 3 | ||||
| -rw-r--r-- | include/myisam.h | 4 | ||||
| -rw-r--r-- | include/myisammrg.h | 2 | ||||
| -rw-r--r-- | include/mysql.h | 1 |
4 files changed, 6 insertions, 4 deletions
diff --git a/include/my_base.h b/include/my_base.h index ccca3f74ec4..6efac979a4e 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -107,9 +107,6 @@ enum ha_extra_function { HA_EXTRA_IGNORE_DUP_KEY, /* Dup keys don't rollback everything*/ HA_EXTRA_NO_IGNORE_DUP_KEY, HA_EXTRA_DONT_USE_CURSOR_TO_UPDATE, /* Cursor will not be used for update */ - HA_EXTRA_BULK_INSERT_BEGIN, - HA_EXTRA_BULK_INSERT_FLUSH, /* Flush one index */ - HA_EXTRA_BULK_INSERT_END, HA_EXTRA_PREPARE_FOR_DELETE, HA_EXTRA_PREPARE_FOR_UPDATE /* Remove read cache if problems */ }; diff --git a/include/myisam.h b/include/myisam.h index 4f8fc149ba1..5c4a5345d37 100644 --- a/include/myisam.h +++ b/include/myisam.h @@ -397,6 +397,10 @@ void mi_disable_non_unique_index(MI_INFO *info, ha_rows rows); my_bool mi_test_if_sort_rep(MI_INFO *info, ha_rows rows, ulonglong key_map, my_bool force); +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); + #ifdef __cplusplus } #endif diff --git a/include/myisammrg.h b/include/myisammrg.h index 16d3528717b..8b09e1a9231 100644 --- a/include/myisammrg.h +++ b/include/myisammrg.h @@ -51,6 +51,7 @@ typedef struct st_mymerge_info /* Struct from h_info */ uint reclength; /* Recordlength */ int errkey; /* With key was dupplicated on err */ uint options; /* HA_OPTION_... used */ + ulong *rec_per_key; /* for sql optimizing */ } MYMERGE_INFO; typedef struct st_myrg_table_info @@ -71,6 +72,7 @@ typedef struct st_myrg_info my_bool cache_in_use; LIST open_list; QUEUE by_key; + ulong *rec_per_key_part; /* for sql optimizing */ } MYRG_INFO; diff --git a/include/mysql.h b/include/mysql.h index daa544f216c..a2b48c0c43d 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -381,7 +381,6 @@ MYSQL_RES * STDCALL mysql_list_fields(MYSQL *mysql, const char *table, MYSQL_RES * STDCALL mysql_list_processes(MYSQL *mysql); MYSQL_RES * STDCALL mysql_store_result(MYSQL *mysql); MYSQL_RES * STDCALL mysql_use_result(MYSQL *mysql); -MYSQL_RES * STDCALL mysql_warnings(MYSQL *mysql); int STDCALL mysql_options(MYSQL *mysql,enum mysql_option option, const char *arg); void STDCALL mysql_free_result(MYSQL_RES *result); |