From: Dyre Tjeldvoll
Date: November 1 2012 1:25pm
Subject: bzr push into mysql-5.5-cluster-7.2 branch (Dyre.Tjeldvoll:4056 to 4057)
List-Archive: http://lists.mysql.com/commits/145186
Message-Id: <20121101132534.7817.17076.4057@khepri17.no.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4057 Dyre Tjeldvoll	2012-11-01 [merge]
      Merge to 7.2

    modified:
      storage/ndb/memcache/unit/test_workqueue.c
 4056 Maitrayi Sabaratnam	2012-11-01 [merge]
      Merge 7.1->7.2

    modified:
      storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
=== modified file 'storage/ndb/memcache/unit/test_workqueue.c'
--- a/storage/ndb/memcache/unit/test_workqueue.c	2012-01-14 00:52:10 +0000
+++ b/storage/ndb/memcache/unit/test_workqueue.c	2012-10-30 09:39:58 +0000
@@ -19,8 +19,8 @@
  */
 
 #ifdef __GNUC__
-/* Required for useconds_t */
-#define _XOPEN_SOURCE 500
+/* Required for useconds_t and C99 */
+#define _XOPEN_SOURCE 600
 #endif
 
 #include <unistd.h>

No bundle (reason: useless for push emails).