From: Tor Didriksen
Date: May 26 2011 7:54am
Subject: bzr commit into mysql-5.5 branch (tor.didriksen:3405)
List-Archive: http://lists.mysql.com/commits/138149
Message-Id: <20110526075423.09CCF24B@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2114185542854779889=="

--===============2114185542854779889==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///export/home/didrik/repo/5.5/ based on revid:dmitry.shulga@stripped

 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
=== 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 "")


--===============2114185542854779889==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
 name="bzr/tor.didriksen@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: tor.didriksen@stripped\
#   7hn528qpnev3ujck
# target_branch: file:///export/home/didrik/repo/5.5/
# testament_sha1: 6ab15ba1ed3bb92a213d00f0b2a3413aa736b9b8
# timestamp: 2011-05-26 09:54:22 +0200
# source_branch: file:///export/home/didrik/repo/trunk/
# base_revision_id: dmitry.shulga@stripped\
#   ntcyhgfgat3of115
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWcWET+YAAZhfgAAQUOf/939l
3KC////wUAP6S9jpzo1mXrrwyQVPGQmARqbJPUE9GmoaNpo00xNTINKJkPJtU2ppoGmgAGmjINAa
AAyI0EGQhMNEnlHlABoGjQaDQMlTIHqAyA2oyAaNNDJoNAAAlETQBI8ExNEDNQGjR6g0ABpjrEe7
tFapr61GmOnJ/ZeAHa9joPfJ9ec7cuyqBE7u0974h6g1BKitXADTeGcdqn02M9hdlT6djBW/ha6Z
vugtlnWHSQPNdsKWTx4v8AxAYvRra/qwM0CP5Hx41zjMCH6wdYmwtT9d8Tt3NcdtLmoCYkqcvCjm
24QA5oExVD04MSaF94WcOuo6hHRtk4gW+QGhVbA4B5sEouk1AVDp74HUwEZg7FpIxK2SsAYJ4XRg
cj0DZInN7K8hrK/EUa9FYkBM/VFXWMKCF+RKFEIC4cQyRWiplURr4yVQuF1wo4CXLlbcA2WhLw7E
qrXujAb7Qo5HwBnMIEKUQSsB2uGIdO574FU6lro4VDxqCi20b7iIMHgifEHWTi1MzSxWsRAyZudW
AMUkHtdlM34YPf0DjS4mYTC0sFCgLMEpkV0qUT7qw8HVgBBhgyQ3WeS0R078hOywGMAYuDNueuLx
MQNQw0jlezNHUguSkwNKRgoufB5SKQEwGkkugrneLMdiDj8eOjeYE/T2AfelxRE+GZN2pAFY7+AE
X64v5wnfk4rZ7LAk5NEe4BZK6QKI3c1soumG5mGWsjdl82hANLD95fIenmSHd71gbY+0/vZDM2C7
C+ZCOdFkUp2RbS7NObd2uB1O8Tg12UxL+07x48zP4CYXjZPfheaPX7FbFFqKJDATU3qMOC1eucZs
lm2CW6IwGHKFv6DXmuqppJ6xDUXEOIHLFuGgrKwC63sRLFX293apedFRQgObcrdjHgl+bIiV0S3J
h8qDpEJsHYUM1lDem7YH1BkAini/PBDuXr1jmIsbRDM/3dP7aquB44Krj04mQ4woAhYOqRLQJ41l
6cNMW897qgYHmwVGmQWjR0iz4xTZxojYWD4FhclziWazAFNyjWkfrw53RVhRgGkG8U4nBmAoBbA0
mkB76vCMI2BbhAxSNEFJTPFZvm1oIzSRzNG0yGs5SZhOSxbBUUqhyBRxKZyqkCA/IGxwCTkFKFyF
DlbZ7TMYAF0EHBQPN7EJJ7yBeibkQUGBvsTHJU62xCyetVRhA28SS19zYXrBYAWikJWUJMMLk4FT
1YUHmgAoC2w1NZLJRJmaqlHp2D8eoCZL5e5JwZGbyw64yIFWjdhjU8DWnOhZXNHGaYVJV1yDP5DE
IvwlAlAsKoVlcVd/52KGoHuOEEnTeJsJkYDqwopahXmHekActfIsChodkTU60epP4u5IpwoSGLCJ
/MA=


--===============2114185542854779889==--