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

[Craig L Russell]

 4268 Craig L Russell	2011-06-29
      Test code to load CharsetMap prior to calling static create method

    modified:
      storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/Utility.java
      storage/ndb/clusterj/clusterj-tie/src/main/resources/com/mysql/clusterj/tie/Bundle.properties
 4267 Jonas Oreland	2011-06-29
      ndb - bump version to 7.1.16

    modified:
      configure.in
      storage/ndb/ndb_configure.m4
=== modified file 'storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/Utility.java'
--- a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/Utility.java	2011-06-02 13:56:47 +0000
+++ b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/Utility.java	2011-06-29 18:02:39 +0000
@@ -99,6 +99,18 @@ public class Utility {
 
     static final byte[] EMPTY_BYTE_ARRAY = new byte[0];
 
+    // TODO: this is intended to investigate a class loader issue with Sparc java
+    // The idea is to force loading the CharsetMap native class prior to calling the static create method
+    static Class<?> charsetMapClass = loadClass("com.mysql.ndbjtie.mysql.CharsetMap");
+    static Class<?> loadClass(String className) {
+        try {
+            return Class.forName(className);
+        } catch (ClassNotFoundException e) {
+            // TODO Auto-generated catch block
+            throw new ClusterJFatalInternalException(local.message("ERR_Loading_Native_Class", className), e);
+        }
+    }
+
     // TODO: change this to a weak reference so we can call delete on it when not needed
     /** Note that mysql refers to charset number and charset name, but the number is
     * actually a collation number. The CharsetMap interface thus has methods like

=== modified file 'storage/ndb/clusterj/clusterj-tie/src/main/resources/com/mysql/clusterj/tie/Bundle.properties'
--- a/storage/ndb/clusterj/clusterj-tie/src/main/resources/com/mysql/clusterj/tie/Bundle.properties	2011-03-08 00:44:56 +0000
+++ b/storage/ndb/clusterj/clusterj-tie/src/main/resources/com/mysql/clusterj/tie/Bundle.properties	2011-06-29 18:02:39 +0000
@@ -18,6 +18,7 @@ ERR_Unsupported_Mapping:Mapping between 
 ERR_Datastore:Datastore exception. Return code: {0} Error code: {1} MySQL code: {2} Status: {3} Classification: {4} Message: {5} 
 ERR_Implementation_Should_Not_Occur:Error in implementation. Please file \
 an issue.
+ERR_Loading_Native_Class:Failed to load native class {0}.
 ERR_Unknown_Column_Type:Table {0} column {1} has an unknown column type {2}.
 ERR_No_Column:Table {0} does not define column {1}.
 ERR_Unknown_Charset_Name:Table {0} column {1} has an unknown charset name {2}.

No bundle (reason: useless for push emails).