From: Tor Didriksen
Date: May 26 2011 8:15am
Subject: bzr push into mysql-trunk branch (tor.didriksen:3116 to 3117)
List-Archive: http://lists.mysql.com/commits/138154
Message-Id: <20110526081521.7734124B@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3117 Tor Didriksen	2011-05-26 [merge]
      merge 5.5 => trunk

    modified:
      cmake/os/WindowsCache.cmake
 3116 Vasil Dimov	2011-05-25
      Non-functional: remove excess ";"

    modified:
      storage/innobase/handler/i_s.cc
      storage/innobase/que/que0que.c
=== modified file 'cmake/os/WindowsCache.cmake'
--- a/cmake/os/WindowsCache.cmake	2011-04-30 05:36:44 +0000
+++ b/cmake/os/WindowsCache.cmake	2011-05-26 08:14:09 +0000
@@ -347,6 +347,7 @@ SET(SIGNAL_RETURN_TYPE_IS_VOID 1 CACHE I
 SET(C_HAS_inline CACHE INTERNAL "")
 SET(C_HAS___inline 1 CACHE INTERNAL "")
 SET(FIONREAD_IN_SYS_IOCTL CACHE INTERNAL "")
+SET(FIONREAD_IN_SYS_FILIO CACHE INTERNAL "")
 SET(GWINSZ_IN_SYS_IOCTL CACHE INTERNAL "")
 SET(HAVE_CXXABI_H CACHE INTERNAL "")
 SET(HAVE_NDIR_H CACHE INTERNAL "")

No bundle (reason: useless for push emails).