← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/mi_extra.c

Merged from lee.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/mi_extra.c
14
14
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
15
15
 
16
16
#include "myisamdef.h"
17
 
#ifdef HAVE_SYS_MMAN_H
 
17
#include <drizzled/util/test.h>
 
18
#include <sys/types.h>
18
19
#include <sys/mman.h>
19
 
#endif
20
 
#include <drizzled/util/test.h>
21
20
 
22
21
static void mi_extra_keyflag(MI_INFO *info, enum ha_extra_function function);
23
22
 
139
138
      error=end_io_cache(&info->rec_cache);
140
139
      /* Sergei will insert full text index caching here */
141
140
    }
142
 
#if defined(HAVE_MMAP) && defined(HAVE_MADVISE)
 
141
#if defined(HAVE_MMAP) && defined(HAVE_MADVISE) && !defined(TARGET_OS_SOLARIS)
143
142
    if (info->opt_flag & MEMMAP_USED)
144
143
      madvise((char*) share->file_map, share->state.state.data_file_length,
145
144
              MADV_RANDOM);
413
412
  }
414
413
  if (share->base.blobs)
415
414
    mi_alloc_rec_buff(info, -1, &info->rec_buff);
416
 
#if defined(HAVE_MMAP) && defined(HAVE_MADVISE)
 
415
#if defined(HAVE_MMAP) && defined(HAVE_MADVISE) && !defined(TARGET_OS_SOLARIS)
417
416
  if (info->opt_flag & MEMMAP_USED)
418
417
    madvise((char*) share->file_map, share->state.state.data_file_length,
419
418
            MADV_RANDOM);