Commit 8cb66fe6 authored by unknown's avatar unknown
Browse files

Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.0 

into mysql.com:/home/bkroot/mysql-5.0
parents 91251238 52bba384

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -207,6 +207,7 @@ ramil@mysql.com 
ranger@regul.home.lan

rburnett@build.mysql.com

reggie@bob.(none)

reggie@mdk10.(none)

root@home.(none)

root@mc04.(none)

root@x3.internalnet

myisam/mi_extra.c

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */



#include "myisamdef.h"

#ifdef HAVE_MMAP

#ifdef HAVE_SYS_MMAN_H

#include <sys/mman.h>

#endif

myisam/mi_packrec.c

+5 −4
Original line number Diff line number Diff line
@@ -1181,11 +1181,12 @@ static uint max_bit(register uint value) 
/*****************************************************************************

	Some redefined functions to handle files when we are using memmap

*****************************************************************************/

#ifdef HAVE_SYS_MMAN_H

#include <sys/mman.h>

#endif



#ifdef HAVE_MMAP



#include <sys/mman.h>



static int _mi_read_mempack_record(MI_INFO *info,my_off_t filepos,byte *buf);

static int _mi_read_rnd_mempack_record(MI_INFO*, byte *,my_off_t, my_bool);
@@ -1211,7 +1212,7 @@ my_bool _mi_memmap_file(MI_INFO *info) 
      DBUG_RETURN(0);

    }

    file_map=(byte*)

      mmap(0,share->state.state.data_file_length+MEMMAP_EXTRA_MARGIN,PROT_READ,

      my_mmap(0,share->state.state.data_file_length+MEMMAP_EXTRA_MARGIN,PROT_READ,

	   MAP_SHARED | MAP_NORESERVE,info->dfile,0L);

    if (file_map == (byte*) MAP_FAILED)

    {
@@ -1230,7 +1231,7 @@ my_bool _mi_memmap_file(MI_INFO *info) 


void _mi_unmap_file(MI_INFO *info)

{

  VOID(munmap((caddr_t) info->s->file_map,

  VOID(my_munmap((caddr_t) info->s->file_map,

	      (size_t) info->s->state.state.data_file_length+

	      MEMMAP_EXTRA_MARGIN));

}

mysys/my_mmap.c

+6 −0
Original line number Diff line number Diff line
@@ -84,6 +84,12 @@ int my_msync(int fd, void *addr, size_t len, int flags) 
}



#endif



#ifdef _WINDOWS

#pragma message "no mmap!"

#else

#warning "no mmap!"

#endif



#endif

sql/sql_map.cc

+4 −4
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#endif



#include "mysql_priv.h"

#ifdef HAVE_MMAP

#ifdef HAVE_SYS_MMAN_H

#include <sys/mman.h>

#include <sys/stat.h>

#endif
@@ -42,7 +42,7 @@ mapped_files::mapped_files(const my_string filename,byte *magic,uint magic_lengt 
    struct stat stat_buf;

    if (!fstat(file,&stat_buf))

    {

      if (!(map=(byte*) mmap(0,(size=(ulong) stat_buf.st_size),PROT_READ,

      if (!(map=(byte*) my_mmap(0,(size=(ulong) stat_buf.st_size),PROT_READ,

			     MAP_SHARED | MAP_NORESERVE,file,

			     0L)))

      {
@@ -53,7 +53,7 @@ mapped_files::mapped_files(const my_string filename,byte *magic,uint magic_lengt 
    if (map && memcmp(map,magic,magic_length))

    {

      my_error(ER_WRONG_MAGIC, MYF(0), name);

      VOID(munmap(map,size));

      VOID(my_munmap(map,size));

      map=0;

    }

    if (!map)
@@ -71,7 +71,7 @@ mapped_files::~mapped_files() 
#ifdef HAVE_MMAP

  if (file >= 0)

  {

    VOID(munmap((caddr_t) map,size));

    VOID(my_munmap((caddr_t) map,size));

    VOID(my_close(file,MYF(0)));

    file= -1; map=0;

  }