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

 3405 Tor Didriksen	2011-05-26
      Don't check for FIONREAD on windows.
      Execution of platforms tests are slow/flaky when building on windows.
      in PB:mysql-next-mr-opt-team on 2011-05-18 for win x86 debug_max, i see:
      -- Looking for FIONREAD
      -- Looking for FIONREAD - found
      and the build fails.

    modified:
      cmake/os/WindowsCache.cmake
 3404 Dmitry Shulga	2011-05-25
      Follow-up for patch for bug#11749345.
     @ sql/sql_show.cc
        Restored DEBUG_SYNC point missed during merge 5.1->5.5

    modified:
      sql/sql_show.cc
=== modified file 'cmake/os/WindowsCache.cmake'
--- a/cmake/os/WindowsCache.cmake	2011-04-30 05:24:38 +0000
+++ b/cmake/os/WindowsCache.cmake	2011-05-26 07:54:19 +0000
@@ -341,6 +341,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).