From: Tor Didriksen
Date: April 4 2011 1:49pm
Subject: bzr commit into mysql-trunk branch (tor.didriksen:3358) Bug#11766392
List-Archive: http://lists.mysql.com/commits/134621
X-Bug: 11766392
Message-Id: <20110404134955.CD4D53784@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8362857162190152276=="

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

#At file:///export/home/didrik/repo/trunk/ based on revid:alfranio.correia@stripped

 3358 Tor Didriksen	2011-04-04
      BUG#11766392 - 59495, post-push fix: R_OK was missing on windows

    modified:
      include/my_global.h
=== modified file 'include/my_global.h'
--- a/include/my_global.h	2011-03-29 12:56:34 +0000
+++ b/include/my_global.h	2011-04-04 13:49:51 +0000
@@ -126,6 +126,7 @@
 /* Define missing access() modes. */
 #define F_OK 0
 #define W_OK 2
+#define R_OK 4                        /* Test for read permission.  */
 
 /* Define missing file locking constants. */
 #define F_RDLCK 1


--===============8362857162190152276==
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\
#   vatvwi09qhqxf8gt
# target_branch: file:///export/home/didrik/repo/trunk/
# testament_sha1: adae35caa86d314c479f8e6f4c8d6b7a2ed42dc3
# timestamp: 2011-04-04 15:49:55 +0200
# source_branch: file:///export/home/didrik/repo/5.5/
# base_revision_id: alfranio.correia@stripped\
#   nk1mbe89kyiy45og
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRfqqqQAAW1/gAAQBABYd//3
VoiWAL////BQA5T3dJdxdh3l3eGSIaGqfqm1P0JPUNP0RqeUPUZMgeo00BokyaTwTTKNT9IQ9TQ0
YgANDEGSDUwKamnoZRjUaMgAAAAZIk9T0h6QGmnqGg0A0AAABJQjSegqewCaZCm9UfojTU9RoADS
7B5++veFTmU74tACqLqVRC7QKczamS2LMzHx6FFNjkDRqwjjj1TZ7roK4O9v3h91e7VRYLWA/nqt
d206MfAKQHbdCfBWxGjMEWOF9Dq/gS0GLqtBZSppIxNhOZXDxe2dsk7XiaxhzGK9sSYId7LhoixB
ENjW+1xqJ4NVz9xVjq1BmCr8e58jtiCHKNAnVoI62u3hSZXK23SawBLkUBvdJgWgXW7TGXR9yrD9
wfeY2E58No3GCFgaGymFR6DBMLWAT0pTqq54CV4MzgbAjbqRGFYkCsCwgRY7C3LUN1mggIa7pAvd
vJdqGQXPGYfgdGEkCAzJ8WaYVX1pKmgm5CtHFAgUkySK82eShcFviTKCShb/CDRzoRE2tLKNQ1OK
u61BY2C0SJCWusiC5NrmMKstgvW24AIaC3ETMAcJwDaGTAxIWI8WsDmFFRwsAViMbkOzTU1KhpSG
WUdJkJnWEQJh880XH6H4IjJs4jvL5p2B9flEMMWBbfgarPTt5pE5uocGJ0VqlqqeHjCZDesq9QMN
KK7D0Xl1gr+Zuu8sfcERAe9x0Zzd0Kj1yWeRk1iQ7kdkiDFp4Pmt7WaPtK/M4U0rYrxrlnhKUDn1
73yaxWTeHOIFu1cK0JCkm3yoOkaTbdDXKmKp5gFYsnYKd2ONWQ/OeQTcURGLjlvQHgBY7yMs7szK
7xg/iyAPTbSF1tJViJsR4qc/mvwuZgxacUzMi7bz2nJDLDuncxW9eHvWhUOBptoFD6WLQXEgHIsf
Sv9Wk6Ro8DJON0eoTRz1f3KuLao0YhotmCiztMNiYy4MuAHdYqQIBBoVvlSGDw29eS7kJJ0izjkt
VNoR0DUt8bFG3R34iWeACowlJ2iSk772CDihujkkQqFCq6o2SvcdTgDEwidgnhyE/SQgCi0wrKV8
0mAuuIhWJlswtXHRt6ZBne+YHaC6BABAUJOuM3wyJ5aRFtcJbrwBQtvhgudSqO2MKtsffcAK33sF
LMUQsicmz6PW9YO02EOsRcgXIRyCU6Qo1QzDBbaNEREGjY4B4Oe1U+hKKyfOSG+kwF8ydMLwkjFs
LJzj4CdNpfS9e4GzuSAoNBYWH0puNHRewTf4u5IpwoSAv1VVIA==


--===============8362857162190152276==--