diff options
| author | monty@mashka.mysql.fi <> | 2002-12-05 19:38:42 +0200 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2002-12-05 19:38:42 +0200 |
| commit | 859b68847666823baa328c5c7f3da96787807bb3 (patch) | |
| tree | 56f9dc35fe3c9e6c4f341e577ff3db68855d9e81 /isam | |
| parent | 564487d7c00098e8a37c8e675197414667685452 (diff) | |
| parent | 496a0e1630f9dc4047fb5244cb87ee5ca03b409e (diff) | |
| download | mariadb-git-859b68847666823baa328c5c7f3da96787807bb3.tar.gz | |
Merge with 4.0.6
Diffstat (limited to 'isam')
| -rw-r--r-- | isam/extra.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/isam/extra.c b/isam/extra.c index 570c396955f..e2f13532ddf 100644 --- a/isam/extra.c +++ b/isam/extra.c @@ -123,6 +123,7 @@ int nisam_extra(N_INFO *info, enum ha_extra_function function) } #endif if (!(info->opt_flag & (READ_CACHE_USED | WRITE_CACHE_USED))) + { if (!(init_io_cache(&info->rec_cache,info->dfile,0, WRITE_CACHE,info->s->state.data_file_length, (pbool) (info->lock_type != F_UNLCK), @@ -131,7 +132,12 @@ int nisam_extra(N_INFO *info, enum ha_extra_function function) info->opt_flag|=WRITE_CACHE_USED; info->update&= ~HA_STATE_ROW_CHANGED; } + } break; + case HA_EXTRA_PREPARE_FOR_UPDATE: + if (info->s->data_file_type != DYNAMIC_RECORD) + break; + /* Remove read/write cache if dynamic rows */ case HA_EXTRA_NO_CACHE: if (info->opt_flag & (READ_CACHE_USED | WRITE_CACHE_USED)) { |