From: Dyre Tjeldvoll
Date: November 28 2012 12:27pm
Subject: bzr push into mysql-5.5-cluster-7.2 branch (Dyre.Tjeldvoll:4114 to 4115)
List-Archive: http://lists.mysql.com/commits/145400
Message-Id: <20121128122755.14845.74922.4115@khepri17.no.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4115 Dyre Tjeldvoll	2012-11-28
      Include unittest in the set of pylibs included in zip, and change mtr test to use bundled python

    modified:
      mysql-test/suite/ndb/t/mcc_pyunit.test
      storage/ndb/mcc/python.cmake
 4114 Dyre Tjeldvoll	2012-11-26
      Use Python from tool tree on Windows

    modified:
      mysql-test/suite/ndb/t/mcc_pyunit.test
=== modified file 'mysql-test/suite/ndb/t/mcc_pyunit.test'
--- a/mysql-test/suite/ndb/t/mcc_pyunit.test	2012-11-26 13:12:33 +0000
+++ b/mysql-test/suite/ndb/t/mcc_pyunit.test	2012-11-28 12:27:25 +0000
@@ -18,8 +18,7 @@ chdir($tstdir);
 
 my $python = $ENV{'MCC_PYTHON'};
 unless ($python) { 
-       #$python = "C:/Python27/python.exe";
-       $python = "$ENV{PB2WORKDIR}/$ENV{MCC_DEP_SOURCENAME}/python27/python.exe";
+       $python = "$ENV{MYSQL_SHAREDIR}/mcc/Python/python.exe";
        unless (-f $python) { $python = "python"; }
 }
 my $exit_code = system($python, "tst_main.py")/256;

=== modified file 'storage/ndb/mcc/python.cmake'
--- a/storage/ndb/mcc/python.cmake	2012-09-18 19:51:09 +0000
+++ b/storage/ndb/mcc/python.cmake	2012-11-28 12:27:25 +0000
@@ -726,4 +726,20 @@ SET(python_lib_xml_sax __init__.py  _exc
 PY_INSTALL(FILES ${python_lib_xml_sax}
 	SRC_DIR "${MCC_PYTHON_TO_BUNDLE}/Lib/xml/sax"
     DESTINATION "${MCC_INSTALL_SUBDIR}/Python/Lib/xml/sax")
-	
\ No newline at end of file
+
+SET(python_lib_unittest 
+  __init__.py
+  __main__.py
+  case.py
+  loader.py
+  main.py
+  result.py
+  runner.py
+  signals.py
+  suite.py
+  util.py)
+
+PY_INSTALL(FILES ${python_lib_unittest}
+	SRC_DIR "${MCC_PYTHON_TO_BUNDLE}/Lib/unittest"
+    DESTINATION "${MCC_INSTALL_SUBDIR}/Python/Lib/unittest")
+  

No bundle (reason: useless for push emails).