bzr push into mysql-5.5-cluster-7.2 branch (john.duncan:3761 to 3762)

[John David Duncan]

 3762 John David Duncan	2012-01-13
      Minor (portability) changes to mtr, S_sched.cc and test_workqueue.c 
      Submitted by release engineering for 7.2.3 release.

    modified:
      mysql-test/mysql-test-run.pl
      storage/ndb/memcache/src/schedulers/S_sched.cc
      storage/ndb/memcache/unit/test_workqueue.c
 3761 Jonas Oreland	2012-01-12 [merge]
      ndb - merge 71 to 72

    modified:
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
      storage/ndb/src/kernel/ndbd.cpp
      storage/ndb/src/kernel/vm/mt.cpp
      storage/ndb/src/mgmsrv/ConfigInfo.cpp
      storage/ndb/test/ndbapi/testNodeRestart.cpp
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2011-12-16 20:53:39 +0000
+++ b/mysql-test/mysql-test-run.pl	2012-01-14 00:52:10 +0000
@@ -3055,13 +3055,17 @@ sub memcached_start {
   
   my $found_perl_source = my_find_file($basedir, 
      ["storage/ndb/memcache",        # source
-      "mysql-test/lib"],             # install 
+      "mysql-test/lib",              # install
+      "share/mysql-test/lib"],       # install 
       "memcached_path.pl", NOT_REQUIRED);
   
   my $found_so = my_find_file($bindir,
     ["storage/ndb/memcache/",       # source or build
-     "lib"],                        # install
+     "lib", "lib64"],               # install
     "ndb_engine.so", NOT_REQUIRED); 
+
+  mtr_verbose("Found memcache script: $found_perl_source");
+  mtr_verbose("Found memcache plugin: $found_so");
      
   my $mgm_host;
   my $mgm_port;

=== modified file 'storage/ndb/memcache/src/schedulers/S_sched.cc'
--- a/storage/ndb/memcache/src/schedulers/S_sched.cc	2011-12-18 23:26:44 +0000
+++ b/storage/ndb/memcache/src/schedulers/S_sched.cc	2012-01-14 00:52:10 +0000
@@ -919,6 +919,8 @@ void * S::Connection::run_ndb_poll_threa
       }
     }
   }
+  return 0; /* not reached */
+  return 0; /* not reached */
 }
 
 

=== modified file 'storage/ndb/memcache/unit/test_workqueue.c'
--- a/storage/ndb/memcache/unit/test_workqueue.c	2011-10-02 23:25:02 +0000
+++ b/storage/ndb/memcache/unit/test_workqueue.c	2012-01-14 00:52:10 +0000
@@ -17,6 +17,12 @@
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  02110-1301  USA
  */
+
+#ifdef __GNUC__
+/* Required for useconds_t */
+#define _XOPEN_SOURCE 500
+#endif
+
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>

No bundle (reason: useless for push emails).