bzr push into mysql-5.1-telco-7.1 branch (Craig.Russell:4389 to 4390)

[Craig L Russell]

 4390 Craig L Russell	2011-12-18
      Change clusterj DBUG test case to use MTR tmp directory

    modified:
      storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DbugTest.java
 4389 Craig L Russell	2011-12-18
      Improve clusterj error handling for loading system library.

    modified:
      storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/ClusterConnectionImpl.java
      storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/ClusterConnectionServiceImpl.java
      storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/DbugImpl.java
=== modified file 'storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DbugTest.java'
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DbugTest.java	2011-12-18 07:56:51 +0000
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DbugTest.java	2011-12-18 18:37:39 +0000
@@ -25,6 +25,8 @@ import com.mysql.clusterj.Dbug;
  */
 public class DbugTest extends AbstractClusterJTest{
 
+    static String tmpFileName = System.getProperty("MYSQL_TMP_DIR", "/tmp") + "/clusterj-test-dbug";
+
     public boolean getDebug() {
         return false;
     }
@@ -44,7 +46,7 @@ public class DbugTest extends AbstractCl
             return;
         }
         String originalState = "t";
-        String newState = "d,jointx:o,/tmp/clusterj-test-dbug";
+        String newState = "d,jointx:o," + tmpFileName;
         dbug.set(originalState);
         String actualState = dbug.get();
         errorIfNotEqual("Failed to set original state", originalState, actualState);
@@ -56,17 +58,17 @@ public class DbugTest extends AbstractCl
         errorIfNotEqual("Failed to pop original state", originalState, actualState);
 
         dbug = ClusterJHelper.newDbug();
-        dbug.output("/tmp/clusterj-test-dbug").flush().debug(new String[] {"a", "b", "c", "d", "e", "f"}).push();
+        dbug.output(tmpFileName).flush().debug(new String[] {"a", "b", "c", "d", "e", "f"}).push();
         actualState = dbug.get();
         // keywords are stored LIFO
-        errorIfNotEqual("Wrong state created", "d,f,e,d,c,b,a:O,/tmp/clusterj-test-dbug", actualState);
+        errorIfNotEqual("Wrong state created", "d,f,e,d,c,b,a:O," + tmpFileName, actualState);
         dbug.pop();
 
         dbug = ClusterJHelper.newDbug();
-        dbug.append("/tmp/clusterj-test-dbug").trace().debug("a,b,c,d,e,f").set();
+        dbug.append(tmpFileName).trace().debug("a,b,c,d,e,f").set();
         actualState = dbug.get();
         // keywords are stored LIFO
-        errorIfNotEqual("Wrong state created", "d,f,e,d,c,b,a:a,/tmp/clusterj-test-dbug:t", actualState);
+        errorIfNotEqual("Wrong state created", "d,f,e,d,c,b,a:a," + tmpFileName + ":t", actualState);
         dbug.pop();
 
         failOnError();

No bundle (reason: useless for push emails).