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 /isam | |
| 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 'isam')
| -rw-r--r-- | isam/isamchk.c | 6 | ||||
| -rw-r--r-- | isam/isamlog.c | 2 | ||||
| -rw-r--r-- | isam/test2.c | 2 | ||||
| -rw-r--r-- | isam/test3.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/isam/isamchk.c b/isam/isamchk.c index 23bded29f79..ea3055534ca 100644 --- a/isam/isamchk.c +++ b/isam/isamchk.c @@ -516,7 +516,7 @@ static int nisamchk(my_string filename) if (!rep_quick) { if (testflag & T_EXTEND) - VOID(init_key_cache(use_buffers,(uint) NEED_MEM)); + VOID(init_key_cache(use_buffers)); VOID(init_io_cache(&read_cache,datafile,(uint) read_buffer_length, READ_CACHE,share->pack.header_length,1, MYF(MY_WME))); @@ -1459,7 +1459,7 @@ my_string name; printf("Data records: %lu\n",(ulong) share->state.records); } - VOID(init_key_cache(use_buffers,NEED_MEM)); + VOID(init_key_cache(use_buffers)); if (init_io_cache(&read_cache,info->dfile,(uint) read_buffer_length, READ_CACHE,share->pack.header_length,1,MYF(MY_WME))) goto err; @@ -1936,7 +1936,7 @@ int write_info; if (share->state.key_root[sort_key] == NI_POS_ERROR) DBUG_RETURN(0); /* Nothing to do */ - init_key_cache(use_buffers,NEED_MEM); + init_key_cache(use_buffers); if (init_io_cache(&info->rec_cache,-1,(uint) write_buffer_length, WRITE_CACHE,share->pack.header_length,1, MYF(MY_WME | MY_WAIT_IF_FULL))) diff --git a/isam/isamlog.c b/isam/isamlog.c index 6d2bde42bf7..0367c03e08a 100644 --- a/isam/isamlog.c +++ b/isam/isamlog.c @@ -329,7 +329,7 @@ static int examine_log(my_string file_name, char **table_names) bzero((gptr) com_count,sizeof(com_count)); init_tree(&tree,0,0,sizeof(file_info),(qsort_cmp2) file_info_compare,1, (tree_element_free) file_info_free, NULL); - VOID(init_key_cache(KEY_CACHE_SIZE,(uint) (10*4*(IO_SIZE+MALLOC_OVERHEAD)))); + VOID(init_key_cache(KEY_CACHE_SIZE)); files_open=0; access_time=0; while (access_time++ != number_of_commands && diff --git a/isam/test2.c b/isam/test2.c index 176346e74fa..c8f97ccdefa 100644 --- a/isam/test2.c +++ b/isam/test2.c @@ -156,7 +156,7 @@ int main(int argc, char *argv[]) goto err; printf("- Writing key:s\n"); if (key_cacheing) - init_key_cache(IO_SIZE*16,(uint) IO_SIZE*4*10); /* Use a small cache */ + init_key_cache(IO_SIZE*16); /* Use a small cache */ if (locking) nisam_lock_database(file,F_WRLCK); if (write_cacheing) diff --git a/isam/test3.c b/isam/test3.c index 6c3390a2720..7027c56d0f6 100644 --- a/isam/test3.c +++ b/isam/test3.c @@ -171,7 +171,7 @@ void start_test(int id) exit(1); } if (key_cacheing && rnd(2) == 0) - init_key_cache(65536L,(uint) IO_SIZE*4*10); + init_key_cache(65536L); printf("Process %d, pid: %d\n",id,(int) getpid()); fflush(stdout); for (error=i=0 ; i < tests && !error; i++) |