diff options
| author | monty@mashka.mysql.fi <> | 2002-07-23 18:31:22 +0300 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2002-07-23 18:31:22 +0300 |
| commit | dddc20d9d1eea5fd526a2082a43801fed304afe4 (patch) | |
| tree | 2e458857fc65791ee553b4cde0e28ef9459050a5 /include/myisammrg.h | |
| parent | 373e19dca1d209476a15d7d61cb350361c9d6efa (diff) | |
| download | mariadb-git-dddc20d9d1eea5fd526a2082a43801fed304afe4.tar.gz | |
New SET syntax & system variables.
Made a some new buffers thread specific and changeable.
Resize of key_buffer.
AUTO_COMMIT -> AUTOCOMMIT
Fixed mutex bug in DROP DATABASE
Fixed bug when using auto_increment as second part of a key where first part could include NULL.
Split handler->extra() to extra() and extra_opt() to be able to support thread specific buffers.
Don't write message to error log when slave reconnects becasue of timeout.
Fixed possible update problem when using DELETE/UPDATE on small tables
(In some cases we used index even if table scanning would be better)
A lot of minior code cleanups
Diffstat (limited to 'include/myisammrg.h')
| -rw-r--r-- | include/myisammrg.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/myisammrg.h b/include/myisammrg.h index acf80ee2adf..c3b3b39424b 100644 --- a/include/myisammrg.h +++ b/include/myisammrg.h @@ -62,14 +62,15 @@ typedef struct st_myrg_table_info typedef struct st_myrg_info { MYRG_TABLE *open_tables,*current_table,*end_table,*last_used_table; - uint merge_insert_method; ulonglong records; /* records in tables */ ulonglong del; /* Removed records */ ulonglong data_file_length; + ulong cache_size; + uint merge_insert_method; uint tables,options,reclength,keys; my_bool cache_in_use; - LIST open_list; - QUEUE by_key; + LIST open_list; + QUEUE by_key; } MYRG_INFO; @@ -93,7 +94,8 @@ extern int myrg_status(MYRG_INFO *file,MYMERGE_INFO *x,int flag); extern int myrg_lock_database(MYRG_INFO *file,int lock_type); extern int myrg_create(const char *name, const char **table_names, uint insert_method, my_bool fix_names); -extern int myrg_extra(MYRG_INFO *file,enum ha_extra_function function); +extern int myrg_extra(MYRG_INFO *file,enum ha_extra_function function, + void *extra_arg); extern void myrg_extrafunc(MYRG_INFO *info,invalidator_by_filename inv); extern ha_rows myrg_records_in_range(MYRG_INFO *info,int inx, const byte *start_key,uint start_key_len, |