From: Vadim Tkachenko
Date: December 19 2005 1:16pm
Subject: bk commit into 5.1 tree (vtkachenko:1.1966) BUG#15843
List-Archive: http://lists.mysql.com/commits/251
X-Bug: 15843
Message-Id: <200512191316.jBJDGUcw018912@quadxeon.mysql.com>

Below is the list of changes that have just been committed into a local
5.1 repository of vtkachenko. When vtkachenko does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1966 05/12/19 14:16:21 vtkachenko@stripped +3 -0
  Bug fix for bug #15843 "Added mmap support in myisam creates compile problem
  on AIX 5.2"
  
  Added dummy definition of MAP_NORESERVE for systems which doesn't provide it,
  removed duplicates
  
  my_sys.h:
    added definition for MAP_NORESERVE
    (for Irix and AIX systems)
  sql_map.cc:
    removed definition of MAP_NORESERVE
  mi_packrec.c:
    removed definition of MAP_NORESERVE and MMAP_PRIVATE

  include/my_sys.h
    1.181 05/12/19 14:13:54 vtkachenko@stripped +3 -0
    added definition for MAP_NORESERVE
    (for Irix and AIX systems)

  sql/sql_map.cc
    1.17 05/12/19 14:13:43 vtkachenko@stripped +0 -4
    removed definition of MAP_NORESERVE

  storage/myisam/mi_packrec.c
    1.35 05/12/19 14:06:07 vtkachenko@stripped +0 -7
    removed definition of MAP_NORESERVE and MMAP_PRIVATE

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	vtkachenko
# Host:	quadxeon.mysql.com
# Root:	/benchmarks/ext3/BUILDS/mysql-5.1-new4

--- 1.180/include/my_sys.h	2005-12-06 18:50:13 +01:00
+++ 1.181/include/my_sys.h	2005-12-19 14:13:54 +01:00
@@ -820,6 +820,9 @@
 #ifndef MAP_NOSYNC
 #define MAP_NOSYNC      0
 #endif
+#ifndef MAP_NORESERVE   
+#define MAP_NORESERVE 0         /* For irix and AIX */
+#endif
 
 #ifdef HAVE_MMAP64
 #define my_mmap(a,b,c,d,e,f)    mmap64(a,b,c,d,e,f)

--- 1.34/storage/myisam/mi_packrec.c	2005-12-01 13:34:10 +01:00
+++ 1.35/storage/myisam/mi_packrec.c	2005-12-19 14:06:07 +01:00
@@ -1176,13 +1176,6 @@
 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);
 
-#ifndef MAP_NORESERVE
-#define MAP_NORESERVE 0		/* For irix */
-#endif
-#ifndef MAP_FAILED
-#define MAP_FAILED -1
-#endif
-
 my_bool _mi_memmap_file(MI_INFO *info)
 {
   byte *file_map;

--- 1.16/sql/sql_map.cc	2005-06-22 11:08:21 +02:00
+++ 1.17/sql/sql_map.cc	2005-12-19 14:13:43 +01:00
@@ -25,10 +25,6 @@
 #include <sys/mman.h>
 #endif
 
-#ifndef MAP_NORESERVE
-#define MAP_NORESERVE 0				// For IRIX
-#endif
-
 mapped_files::mapped_files(const my_string filename,byte *magic,uint magic_length)
 {
 #ifdef HAVE_MMAP