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

[Dyre Tjeldvoll]

 4051 Dyre Tjeldvoll	2012-09-17
      hg changeset: 248:3e1cef728a8b
      Do not use zip.py until it becomes added, and fix unit test errors resulting from modified hostInfoRep for Linux and Solaris

    modified:
      storage/ndb/mcc/frontend/CMakeLists.txt
      storage/ndb/mcc/tst/tst_main.py
 4050 Dyre Tjeldvoll	2012-09-17
      Merge

    modified:
      storage/ndb/mcc/clusterhost.py
      storage/ndb/mcc/frontend/js/mcc/configuration/calculations.js
      storage/ndb/mcc/frontend/js/mcc/storage/MCCStorage.js
=== modified file 'storage/ndb/mcc/frontend/CMakeLists.txt'

=== modified file 'storage/ndb/mcc/frontend/CMakeLists.txt'
--- a/storage/ndb/mcc/frontend/CMakeLists.txt	2012-09-17 11:31:58 +0000
+++ b/storage/ndb/mcc/frontend/CMakeLists.txt	2012-09-17 13:01:43 +0000
@@ -1,8 +1,8 @@
 # What if we don't have zip...? Find program? Already done in Cluster CMake? 
 add_custom_command(OUTPUT "dojo.zip" 
-  #COMMAND "zip" "-r" "${CMAKE_CURRENT_BINARY_DIR}/dojo.zip" "dojo"
+  COMMAND "zip" "-r" "${CMAKE_CURRENT_BINARY_DIR}/dojo.zip" "dojo"
   #COMMAND "cpack" "-G" "ZIP" "--config" "<some file>" "${CMAKE_SOURCE_DIR}"
-  COMMAND "python" "${CMAKE_CURRENT_SOURCE_DIR}/../zip.py" "dojo.zip" "dojo" 
+  #COMMAND "python" "${CMAKE_CURRENT_SOURCE_DIR}/../zip.py" "dojo.zip" "dojo" 
   WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
 
 add_custom_target(dojozip ALL 

=== modified file 'storage/ndb/mcc/tst/tst_main.py'
--- a/storage/ndb/mcc/tst/tst_main.py	2012-08-28 10:30:26 +0000
+++ b/storage/ndb/mcc/tst/tst_main.py	2012-09-17 13:01:43 +0000
@@ -21,6 +21,7 @@
 import time
 import socket
 import stat
+import os.path
 
 import request_handler
 import config_parser
@@ -30,15 +31,21 @@
 from util import mock_msg, is_set
 from clusterhost import ABClusterHost, produce_ABClusterHost, LocalClusterHost
 
+tst_datadir = os.path.join(os.path.expanduser('~'), 'MySQL_Cluster', 'data')
+
 SUNOS_HOST = {'name' : 'fimafeng08.no.oracle.com',
               'memory' : 4096,
               'hostInfoRep': { 'host': { 'name' : 'fimafeng08.no.oracle.com' },
-                              'hostRes' : {'ram' : 4096, 'cores' : 4, 'uname' : 'SunOS' }}}
+                              'hostRes' : {'ram' : 4096, 'cores' : 4, 'uname' : 'SunOS',
+                                           'datadir': tst_datadir,
+                                           'installdir': None }}}
 
 LINUX_HOST = {'name': 'fimafeng09.no.oracle.com',
               'memory': 7991,
               'hostInfoRep': { 'host': { 'name' : 'fimafeng09.no.oracle.com' },
-                              'hostRes' : {'ram' : 7991, 'cores' : 4, 'uname': 'Linux' }}}
+                              'hostRes' : {'ram' : 7991, 'cores' : 4, 'uname': 'Linux',
+                                           'datadir': tst_datadir,
+                                           'installdir': None }}}
 
 WINDOWS_HOST = {'name' : 'tyr04.no.oracle.com',
                 'memory': 8190,

No bundle (reason: useless for push emails).