bzr push into mysql-5.5-cluster branch (john.duncan:3547 to 3548)

[John David Duncan]

 3548 John David Duncan	2011-09-24
      Help mtr find memcached in an installed tree that has been moved from CMAKE_INSTALL_PREFIX to somewhere else (as in a pushbuild test run).

    modified:
      mysql-test/mysql-test-run.pl
      storage/ndb/memcache/memcached_path.pl.in
 3547 John David Duncan	2011-09-24
      one more mtr path-related fix

    modified:
      mysql-test/mysql-test-run.pl
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2011-09-24 07:07:22 +0000
+++ b/mysql-test/mysql-test-run.pl	2011-09-25 01:44:26 +0000
@@ -3037,6 +3037,7 @@ sub memcached_start {
     $ndb_opt_string = $ndb_opt_string . ";" . $options;
   }
 
+
   $found_perl_source ne "" or return;
   $found_so ne "" or mtr_error("Failed to find ndb_engine.so");  
   require "$found_perl_source";
@@ -3044,8 +3045,19 @@ sub memcached_start {
   {
     mtr_error("Memcached not available.");
   }
-  my $exe = get_memcached_exe_path();
-  
+  my $exe = "";
+  if(memcached_is_bundled())
+  {
+    $exe = my_find_bin($bindir,
+    ["libexec", "sbin", "bin", "storage/ndb/memcache/extra/memcached"],
+    "memcached", NOT_REQUIRED);
+  }
+  else 
+  {
+    $exe = get_memcached_exe_path();
+  }
+  $exe ne "" or mtr_error("Failed to find memcached.");
+
   my $args;
   mtr_init_args(\$args);
   mtr_add_arg($args, "-p");

=== modified file 'storage/ndb/memcache/memcached_path.pl.in'
--- a/storage/ndb/memcache/memcached_path.pl.in	2011-09-21 09:21:54 +0000
+++ b/storage/ndb/memcache/memcached_path.pl.in	2011-09-25 01:44:26 +0000
@@ -20,7 +20,6 @@
 
 use strict;
 
-
 sub memcached_is_available() {
   if("@MEMCACHED_FOUND@" eq "TRUE") {
     return 1;
@@ -30,6 +29,10 @@ sub memcached_is_available() {
   }
 }
 
+sub memcached_is_bundled() {
+  return ("@WITH_MEMCACHE@" eq "ON") ? 1 : 0;
+}
+
 sub get_memcached_exe_path() {
   return "@MEMCACHED_BIN_PATH@";
 }

No bundle (reason: useless for push emails).