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 /myisam/myisampack.c | |
| 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 'myisam/myisampack.c')
| -rw-r--r-- | myisam/myisampack.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/myisam/myisampack.c b/myisam/myisampack.c index b7dd788821a..14fde9aa8b3 100644 --- a/myisam/myisampack.c +++ b/myisam/myisampack.c @@ -2088,7 +2088,7 @@ static void mrg_reset(PACK_MRG_INFO *mrg) { if (mrg->current) { - mi_extra(*mrg->current,HA_EXTRA_NO_CACHE); + mi_extra(*mrg->current, HA_EXTRA_NO_CACHE, 0); mrg->current=0; } } @@ -2103,8 +2103,8 @@ static int mrg_rrnd(PACK_MRG_INFO *info,byte *buf) { isam_info= *(info->current=info->file); info->end=info->current+info->count; - mi_extra(isam_info,HA_EXTRA_RESET); - mi_extra(isam_info,HA_EXTRA_CACHE); + mi_extra(isam_info, HA_EXTRA_RESET, 0); + mi_extra(isam_info, HA_EXTRA_CACHE, 0); filepos=isam_info->s->pack.header_length; } else @@ -2120,14 +2120,14 @@ static int mrg_rrnd(PACK_MRG_INFO *info,byte *buf) filepos, 1)) || error != HA_ERR_END_OF_FILE) return (error); - mi_extra(isam_info,HA_EXTRA_NO_CACHE); + mi_extra(isam_info,HA_EXTRA_NO_CACHE, 0); if (info->current+1 == info->end) return(HA_ERR_END_OF_FILE); info->current++; isam_info= *info->current; filepos=isam_info->s->pack.header_length; - mi_extra(isam_info,HA_EXTRA_RESET); - mi_extra(isam_info,HA_EXTRA_CACHE); + mi_extra(isam_info,HA_EXTRA_RESET, 0); + mi_extra(isam_info,HA_EXTRA_CACHE, 0); } } |