diff options
author | jimw@mysql.com <> | 2005-08-31 18:34:16 -0700 |
---|---|---|
committer | jimw@mysql.com <> | 2005-08-31 18:34:16 -0700 |
commit | c3f4ecb544ffb597bcf5b2aae7efccb5699fec48 (patch) | |
tree | 80e1955f8266db9ec4aff1ea0e0b35fbf3d036ab /myisam | |
parent | 0ebf1576dc89be0901ed757355fa3f030a483105 (diff) | |
parent | 37bf8394ab32a2a77a0bbc73c0cc3a54129fe27f (diff) | |
download | mariadb-git-c3f4ecb544ffb597bcf5b2aae7efccb5699fec48.tar.gz |
Merge mysql.com:/home/jimw/my/mysql-4.1-7156
into mysql.com:/home/jimw/my/mysql-4.1-clean
Diffstat (limited to 'myisam')
-rw-r--r-- | myisam/mi_extra.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/myisam/mi_extra.c b/myisam/mi_extra.c index 4b011ca424f..1827aed98c3 100644 --- a/myisam/mi_extra.c +++ b/myisam/mi_extra.c @@ -62,7 +62,7 @@ int mi_extra(MI_INFO *info, enum ha_extra_function function, void *extra_arg) } if (share->base.blobs) mi_alloc_rec_buff(info, -1, &info->rec_buff); -#if defined(HAVE_MMAP) && defined(HAVE_MADVICE) +#if defined(HAVE_MMAP) && defined(HAVE_MADVISE) if (info->opt_flag & MEMMAP_USED) madvise(share->file_map,share->state.state.data_file_length,MADV_RANDOM); #endif @@ -93,7 +93,7 @@ int mi_extra(MI_INFO *info, enum ha_extra_function function, void *extra_arg) my_errno=EACCES; break; } -#if defined(HAVE_MMAP) && defined(HAVE_MADVICE) +#if defined(HAVE_MMAP) && defined(HAVE_MADVISE) if ((share->options & HA_OPTION_COMPRESS_RECORD)) { pthread_mutex_lock(&share->intern_lock); @@ -177,7 +177,7 @@ int mi_extra(MI_INFO *info, enum ha_extra_function function, void *extra_arg) error=end_io_cache(&info->rec_cache); /* Sergei will insert full text index caching here */ } -#if defined(HAVE_MMAP) && defined(HAVE_MADVICE) +#if defined(HAVE_MMAP) && defined(HAVE_MADVISE) if (info->opt_flag & MEMMAP_USED) madvise(share->file_map,share->state.state.data_file_length,MADV_RANDOM); #endif |