From: magnus.blaudd
Date: May 24 2011 2:36pm
Subject: bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4412)
List-Archive: http://lists.mysql.com/commits/137997
Message-Id: <20110524143637.4078B13402B@pilot>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7160866395584591795=="

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

#At file:///home/msvensson/mysql/7.0/ based on revid:magnus.blaudd@stripped

 4412 magnus.blaudd@stripped	2011-05-24
      ndb
       - Don't define ENOTSUP on Windows if it's already defined

    modified:
      storage/ndb/src/common/util/ndbzio.c
=== modified file 'storage/ndb/src/common/util/ndbzio.c'
--- a/storage/ndb/src/common/util/ndbzio.c	2011-04-18 14:15:23 +0000
+++ b/storage/ndb/src/common/util/ndbzio.c	2011-05-24 14:34:41 +0000
@@ -167,9 +167,11 @@ void ndbz_free(voidpf opaque, voidpf add
 }
 
 #ifdef _WIN32
-/* Windows doesn't define ENOTSUP, define it same as Solaris */
+#ifndef ENOTSUP
+/* If Windows doesn't define ENOTSUP, define it same as Solaris */
 #define ENOTSUP 48
 #endif
+#endif
 
 #ifndef HAVE_POSIX_MEMALIGN
 static inline int posix_memalign(void **memptr, size_t alignment, size_t size)


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: magnus.blaudd@stripped\
#   kkwgelrmmqmx9n22
# target_branch: file:///home/msvensson/mysql/7.0/
# testament_sha1: 2f2c0b4d82cd4d6eaf8bcdeef5a77fa276ab693e
# timestamp: 2011-05-24 16:36:37 +0200
# source_branch: file:///home/msvensson/mysql/7.0-dusky/
# base_revision_id: magnus.blaudd@stripped\
#   ab9y5kdkff5o54sr
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWX+Vk+YAAXffgAAQWPf/91Yh
zoC////wUAONe6Jzs7dg11DJI0TFP1DTKZjSmno1PUDxI9QNM1NHqDJSbTVPaYmTSniENommJoAA
AaDQQajSPSnp6hPQmTQAAMQA0HMAmAEwAAmAAJgACSQQMpo0nqbCBGUw1AANA0aZ52XK+f5Yn1Wy
u2KMethAvmfndioW42Hm518NKIh4+5xdzQIBhe4OdLVw+g1TWxHWDjvc71Vcjmuv+kKsxOqjlpX0
kiEawvSKrNys6RDkCJi0ahyhiaD91SyQyvTEiszkinZ1WyjjoiibDSd2kTybkwiOrUevZDkMgnEe
npw2/BripA9Fg8uhrARmD9bAQwKDFUKmrlTIt7HkBB+rJkPHrLUTvi3qpU9JhPqY31zJl7l4DmEV
m1DxsRGrTeYVjGMNYY5ldNR5l77qqBy5sBOtNo8GfL9lBdwJJ4poHWNvZBMYsAe0qSt6qvhSPuLD
dAxoEEUQEzjUWXiI5gHyZD6DzlxsbWK7RpP6444YG+e+ZuGWqIfddkIQLiaShsXcjQmnOJmQHFsc
40WhJJEIEvaesmfVcog0IxN+eiiR3E6QnvBZCo2FLcElnYcDIHagi9SOJvDARY+cYsracSmOLsQi
CiJgxuyqgCjxOJxLvM4lQazRCDbwcFC3nQNApyvKx33kjYGh9ATNSa1kf3gSNslRkvqrI6F0mYkb
Kw4Ww0zMKd5Iq3vnGJCjrYGFIbWhow4UW3KRCQ9pIr4OEKs0cJ4Eh09CoTbTpBRSJEejYNWX3pF5
DaEfa/I+Si80DB8Ijg27VIAaZEubhLXB6uVKVC8RZDSsPMZQNHb2RjfEYgZgNnlpN9yC0F8VDYRl
XTHr0Zs1gYCgYlqhg3pjGHURcuLGMuCqPPPjWEM3nEuKxfUW4cCmYBRIKSXWS5965uow0sb33piF
4ehANH92an8FrC7iEjfDuyPJatxyNhmPWxYhiKjAW/aFoWuDt96RGaQxww8XUiq6FYjMPsfcZxtV
RF8jJ5EToxHC+AraaTUx8Rd45b7KAswt5a4iqbHZAzZQZZJDl3VOUVejcJSDHk+BsrgGRI3EdRuU
ZGDNQa2TIhqWH4HHd9rwspbslYAZ2rk0US56SrhGtVC1wuoiGFPp3l6RbYjaXmLqgEWY0Y60V4m1
QYAxLIxDtyarFTfIltxyW8Yw6FeXbO40aEMEGVuVSR2bKaEhseykgsQdNx2C0lY0AzmK4TINxuF6
22SFkwqCD/F3JFOFCQf5WT5g


--===============7160866395584591795==--