From: Tor Didriksen
Date: April 4 2011 1:50pm
Subject: bzr push into mysql-trunk branch (tor.didriksen:3357 to 3358) Bug#11766392
List-Archive: http://lists.mysql.com/commits/134622
X-Bug: 11766392
Message-Id: <20110404135051.242EB3784@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

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

    modified:
      include/my_global.h
 3357 Alfranio Correia	2011-04-04 [merge]
      merge mysql-trunk (local) --> mysql-trunk
      
      Conflicts:
        . sql/share/errmsg-utf8.txt

    modified:
      mysql-test/include/mtr_warnings.sql
      mysql-test/suite/rpl/r/rpl_migration_crash_safe.result
      mysql-test/suite/rpl/t/rpl_migration_crash_safe.test
      mysql-test/suite/sys_vars/r/master_info_repository_basic.result
      mysql-test/suite/sys_vars/r/relay_log_info_repository_basic.result
      mysql-test/suite/sys_vars/t/master_info_repository_basic.test
      mysql-test/suite/sys_vars/t/relay_log_info_repository_basic.test
      scripts/mysql_install_db.pl.in
      scripts/mysql_install_db.sh
      sql/rpl_info.cc
      sql/rpl_info.h
      sql/rpl_info_factory.cc
      sql/rpl_info_factory.h
      sql/rpl_info_file.cc
      sql/rpl_info_file.h
      sql/rpl_info_handler.cc
      sql/rpl_info_handler.h
      sql/rpl_info_table.cc
      sql/rpl_info_table.h
      sql/rpl_info_table_access.cc
      sql/rpl_info_values.cc
      sql/rpl_mi.h
      sql/rpl_rli.h
      sql/rpl_slave.cc
      sql/rpl_slave.h
      sql/share/errmsg-utf8.txt
      sql/sql_binlog.cc
      sql/sql_class.h
      sql/sys_vars.cc
      sql/table.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

No bundle (reason: useless for push emails).