bzr push into mysql-5.5-cluster-7.2 branch (Dyre.Tjeldvoll:4159 to 4160)

[Dyre Tjeldvoll]

 4160 Dyre Tjeldvoll	2013-01-15
      Cannot test env vars directly with if in cmake

    modified:
      storage/ndb/mcc/CMakeLists.txt
 4159 Dyre Tjeldvoll	2013-01-15
      Remove writing of deathkey.txt

    modified:
      storage/ndb/mcc/request_handler.py
=== modified file 'storage/ndb/mcc/CMakeLists.txt'
--- a/storage/ndb/mcc/CMakeLists.txt	2013-01-11 09:57:36 +0000
+++ b/storage/ndb/mcc/CMakeLists.txt	2013-01-15 12:09:23 +0000
@@ -111,7 +111,8 @@ if(WIN32 AND MCC_PYTHON_TO_BUNDLE)
   endif(BUNDLEPY_EXE)
   # Install the python dir regardless of tests so that win packages can
   # be built on other platforms
-  if($ENV{WIXSOURCE})
+  set(WS $ENV{WIXSOURCE})
+  if(WS)
     message("Bundling custom Python for Wix")
     # Add a custom python when building msi to avoid path problems
     INCLUDE(python.cmake)

No bundle (reason: useless for push emails).