bzr push into mysql-5.1-telco-7.1 branch (magnus.blaudd:3785 to 3786)

[Magnus Blåudd]

 3786 Magnus Blåudd	2010-08-31 [merge]
      Merge 7.0 -> 7.1

    modified:
      storage/ndb/src/kernel/angel.cpp
 3785 Jonas Oreland	2010-08-31 [merge]
      ndb - merge 70 to 71

    modified:
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
      storage/ndb/test/ndbapi/testScan.cpp
      storage/ndb/test/run-test/daily-basic-tests.txt
=== modified file 'storage/ndb/src/kernel/angel.cpp'
--- a/storage/ndb/src/kernel/angel.cpp	2010-08-20 08:35:41 +0000
+++ b/storage/ndb/src/kernel/angel.cpp	2010-08-31 11:46:48 +0000
@@ -319,6 +319,23 @@ extern int real_main(int, char**);
 static pid_t
 spawn_process(const char* progname, const BaseString& args)
 {
+#ifdef _WIN32
+  // Get full path name of this executeble
+  char path[MAX_PATH];
+  DWORD len = GetModuleFileName(NULL, path, sizeof(path));
+  if (len == 0 || len == sizeof(path))
+  {
+    g_eventLogger->warning("spawn_process: Could not extract full path, "
+                           "len: %u, error: %u\n",
+                           len, GetLastError());
+    // Fall through and try with progname as it was supplied
+  }
+  else
+  {
+    progname = path;
+  }
+#endif
+
   char** argv = BaseString::argify(progname, args.c_str());
   if (!argv)
   {

Attachment: [text/bzr-bundle] bzr/[e-mail]