bzr push into mysql-5.1-telco-7.1 branch (jonas.oreland:4465 to 4466)

[Jonas Oreland]

 4466 Jonas Oreland	2012-02-17 [merge]
      ndb - merge 70 to 71

    modified:
      storage/ndb/test/run-test/atrt.hpp
      storage/ndb/test/run-test/command.cpp
      storage/ndb/test/run-test/setup.cpp
 4465 Martin Skold	2012-02-17 [merge]
      Merge

    modified:
      mysql-test/suite/ndb/r/ndb_basic.result
      mysql-test/suite/ndb/t/ndb_basic.test
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster.h
      sql/ha_ndbcluster_binlog.cc
=== modified file 'storage/ndb/test/run-test/atrt.hpp'
--- a/storage/ndb/test/run-test/atrt.hpp	2011-12-16 14:45:19 +0000
+++ b/storage/ndb/test/run-test/atrt.hpp	2012-02-17 13:41:44 +0000
@@ -205,6 +205,7 @@ extern const char * g_clusters;
  *   we keep full path to them here
  */
 char * find_bin_path(const char * basename);
+char * find_bin_path(const char * prefix, const char * basename);
 extern const char * g_ndb_mgmd_bin_path;
 extern const char * g_ndbd_bin_path;
 extern const char * g_ndbmtd_bin_path;

=== modified file 'storage/ndb/test/run-test/command.cpp'
--- a/storage/ndb/test/run-test/command.cpp	2011-06-30 15:59:25 +0000
+++ b/storage/ndb/test/run-test/command.cpp	2012-02-17 13:41:01 +0000
@@ -162,8 +162,15 @@ do_change_version(atrt_config& config, S
                                   BaseString("MYSQL_BASE_DIR"),
                                   BaseString(new_prefix));
   proc.m_proc.m_env.assign(newEnv);
-  BaseString suffix(proc.m_proc.m_path.substr(strlen(old_prefix)));
-  proc.m_proc.m_path.assign(new_prefix).append(suffix);
+
+  ssize_t pos = proc.m_proc.m_path.lastIndexOf('/');
+  BaseString exename(proc.m_proc.m_path.substr(pos));
+  char * exe = find_bin_path(new_prefix, exename.c_str());
+  proc.m_proc.m_path = exe;
+  if (exe)
+  {
+    free(exe);
+  }
   if (process_args && strlen(process_args))
   {
     /* Beware too long args */

=== modified file 'storage/ndb/test/run-test/setup.cpp'
--- a/storage/ndb/test/run-test/setup.cpp	2011-12-05 10:48:50 +0000
+++ b/storage/ndb/test/run-test/setup.cpp	2012-02-17 13:41:01 +0000
@@ -1075,6 +1075,12 @@ operator<<(NdbOut& out, const atrt_proce
 char *
 find_bin_path(const char * exe)
 {
+  return find_bin_path(g_prefix, exe);
+}
+
+char *
+find_bin_path(const char * prefix, const char * exe)
+{
   if (exe == 0)
     return 0;
 
@@ -1089,7 +1095,7 @@ find_bin_path(const char * exe)
   for (int i = 0; g_search_path[i] != 0; i++)
   {
     BaseString p;
-    p.assfmt("%s/%s/%s", g_prefix, g_search_path[i], exe);
+    p.assfmt("%s/%s/%s", prefix, g_search_path[i], exe);
     if (File_class::exists(p.c_str()))
     {
       return strdup(p.c_str());

No bundle (reason: useless for push emails).