[prev in list] [next in list] [prev in thread] [next in thread] 

List:       mysql-internals
Subject:    bk commit into 5.0 tree (petr:1.1857)
From:       Petr Chardin <petr () mysql ! com>
Date:       2005-02-27 15:53:16
Message-ID: 20050227155316.9CE52A7F58 () owlet ! local
[Download RAW message or body]

Below is the list of changes that have just been committed into a local
5.0 repository of cps. When cps 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.1857 05/02/27 18:53:11 petr@mysql.com +1 -0
  Merge mysql.com:/home/cps/mysql/trees/mysql-5.0
  into mysql.com:/home/cps/mysql/devel/im-fix-review

  include/my_sys.h
    1.139 05/02/27 18:53:09 petr@mysql.com +0 -0
    Auto merged

# 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:	petr
# Host:	owlet.
# Root:	/home/cps/mysql/devel/im-fix-review/RESYNC

--- 1.138/include/my_sys.h	2005-02-20 23:01:06 +03:00
+++ 1.139/include/my_sys.h	2005-02-27 18:53:09 +03:00
@@ -804,8 +804,13 @@
 #endif
 
 #define my_mmap(a,b,c,d,e,f)    mmap(a,b,c,d,e,f)
+#ifdef HAVE_GETPAGESIZE
 #define my_getpagesize()        getpagesize()
-#define my_munmap(a,b)          munmap(a,b)
+#else
+/* qnx ? */
+#define my_getpagesize()        8192
+#endif
+#define my_munmap(a,b)          munmap((char*)(a),(b))
 
 #else
 /* not a complete set of mmap() flags, but only those that nesessary */

-- 
MySQL Internals Mailing List
For list archives: http://lists.mysql.com/internals
To unsubscribe:    http://lists.mysql.com/internals?unsub=mysql-internals@progressive-comp.com

[prev in list] [next in list] [prev in thread] [next in thread]