From: Joerg Bruehe
Date: August 25 2011 3:06pm
Subject: bzr push into mysql-trunk branch (joerg.bruehe:3401 to 3403)
List-Archive: http://lists.mysql.com/commits/140796
Message-Id: <201108251506.p7PF6e8P030456@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3403 Joerg Bruehe	2011-08-25 [merge]
      Upmerge an empty merge changeset from 5.5  -  no change.

 3402 Joerg Bruehe	2011-08-25 [merge]
      Upmerge a bug fix (#55713) from 5.5.
      "extra/innochecksum.c" has changed significantly, so the BZR merge logic did not handle it,
      the change was done manually.

    modified:
      extra/innochecksum.c
 3401 Hery Ramilison	2011-08-25
      Version raised when cloning for the 5.6.3-m5 build.

    modified:
      VERSION
=== modified file 'extra/innochecksum.c'
--- a/extra/innochecksum.c	2011-08-22 07:46:51 +0000
+++ b/extra/innochecksum.c	2011-08-25 14:50:23 +0000
@@ -699,20 +699,8 @@ buf_calc_page_old_checksum(
 
 #endif /* INNOCHECKSUM_SOLARIS */
 
-/* needed to have access to 64 bit file functions */
-#ifndef _LARGEFILE_SOURCE
-#define _LARGEFILE_SOURCE
-#endif /* _LARGEFILE_SOURCE */
-
-#ifndef _LARGEFILE64_SOURCE
-#define _LARGEFILE64_SOURCE
-#endif /* _LARGEFILE64_SOURCE */
-
-#ifdef _XOPEN_SOURCE
-#undef _XOPEN_SOURCE
-#endif /* _XOPEN_SOURCE */
-#define _XOPEN_SOURCE 500 /* needed to include getopt.h on some platforms. */
 
+#include <my_global.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>

No bundle (reason: useless for push emails).