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

[Dyre Tjeldvoll]

 4102 Dyre Tjeldvoll	2012-11-05
      Better tracing in mtr wrapper and add location unittest2

    modified:
      mysql-test/suite/ndb/t/mcc_pyunit.test
      storage/ndb/mcc/tst/tst_main.py
 4101 Dyre Tjeldvoll	2012-11-02
      Look up MYSQL_SHAREDIR from env to locate unit tests for different layouts

    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-02 14:31:03 +0000
+++ b/mysql-test/suite/ndb/t/mcc_pyunit.test	2012-11-05 11:42:43 +0000
@@ -1,9 +1,16 @@
 --perl
 use strict;
 
+my $tstdir = "../storage/ndb/mcc/tst";
 # Assume source package layout first... then try install/package layout
-warn `env`;
-chdir("../storage/ndb/mcc/tst") || chdir($ENV{MYSQL_SHAREDIR} . "/mcc/tst");
+unless (-f "$tstdir/tst_main.py") { 
+  warn "MYSQL_SHAREDIR=$ENV{MYSQL_SHAREDIR}";
+  die "MYSQL_SHAREDIR not set" unless ($ENV{MYSQL_SHAREDIR});
+  $tstdir = "$ENV{MYSQL_SHAREDIR}/mcc/tst";
+  die "tst_main.py not found in $tstdir" unless (-f "$tstdir/tst_main.py");
+}
+warn "tst_main.py found in: $tstdir";
+chdir($tstdir);
 warn `pwd`;
 
 my $exit_code = system("python", "tst_main.py")/256;

=== modified file 'storage/ndb/mcc/tst/tst_main.py'
--- a/storage/ndb/mcc/tst/tst_main.py	2012-11-02 11:58:09 +0000
+++ b/storage/ndb/mcc/tst/tst_main.py	2012-11-05 11:42:43 +0000
@@ -25,7 +25,7 @@ import sys
 sys.path += ['..', '/usr/local/lib/bzr-2.1.0-2010.03/lib/python2.6/site-packages']
 
 if pyminor < 7:
-    sys.path += ['/export/home/tmp/src/python/unittest2-0.5.1']
+    sys.path += ['/export/home/tmp/src/python/unittest2-0.5.1', '/home/dtjeldvo/unittest2-0.5.1' ]
     import unittest2 as unittest
 else:
     import unittest

No bundle (reason: useless for push emails).