From: Vadim Tkachenko
Date: December 19 2005 8:18am
Subject: bk commit into 5.1 tree (vtkachenko:1.1980) BUG#15843
List-Archive: http://lists.mysql.com/commits/239
X-Bug: 15843
Message-Id: <200512190818.jBJ8IovO011810@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.1980 05/12/19 09:18:41 vtkachenko@stripped +1 -0
  my_sys.h:
    fix for bug #15843

  include/my_sys.h
    1.181 05/12/19 09:17:42 vtkachenko@stripped +6 -0
    fix for bug #15843

# 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-new3

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