From: kent
Date: December 19 2005 10:24pm
Subject: bk commit into 5.1 tree (kent:1.1969)
List-Archive: http://lists.mysql.com/commits/270
Message-Id: <20051219222409.0B9627B6772@boortz.dyndns.org>

Below is the list of changes that have just been committed into a local
5.1 repository of kent. When kent 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.1969 05/12/19 23:23:53 kent@stripped +2 -0
  my_sys.h:
    Added MAP_NORESERVE set to 0 for Windows
  config-win.h:
    If MAX_INDEXES is not set, set it to 64 on Windows

  include/my_sys.h
    1.182 05/12/19 23:23:28 kent@stripped +1 -0
    Added MAP_NORESERVE set to 0 for Windows

  include/config-win.h
    1.72 05/12/19 23:17:52 kent@stripped +4 -0
    If MAX_INDEXES is not set, set it to 64 on Windows

# 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:	kent
# Host:	c-664072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root:	/Users/kent/mysql/bk/mysql-5.1-new

--- 1.71/include/config-win.h	2005-12-13 09:19:58 +01:00
+++ 1.72/include/config-win.h	2005-12-19 23:17:52 +01:00
@@ -61,6 +61,10 @@
 #define __WIN__			      /* To make it easier in VC++ */
 #endif
 
+#ifndef MAX_INDEXES
+#define MAX_INDEXES 64
+#endif
+
 /* File and lock constants */
 #define O_SHARE		0x1000		/* Open file in sharing mode */
 #ifdef __BORLANDC__

--- 1.181/include/my_sys.h	2005-12-19 14:13:54 +01:00
+++ 1.182/include/my_sys.h	2005-12-19 23:23:28 +01:00
@@ -841,6 +841,7 @@
 /* not a complete set of mmap() flags, but only those that nesessary */
 #define PROT_READ        1
 #define PROT_WRITE       2
+#define MAP_NORESERVE    0
 #define MAP_SHARED       0x0001
 #define MAP_NOSYNC       0x0800
 #define MAP_FAILED       ((void *)-1)