From: Jonas Oreland
Date: July 5 2011 1:00pm
Subject: bzr push into mysql-5.5-cluster branch (jonas.oreland:3420 to 3422)
List-Archive: http://lists.mysql.com/commits/140196
Message-Id: <20110705130053.99E25A7E211@perch.localdomain>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3422 Jonas Oreland	2011-07-05 [merge]
      ndb - merge 71 to 55

    modified:
      storage/ndb/clusterj/clusterj-jdbc/src/main/antlr3/imports/MySQL51Functions.g
      storage/ndb/clusterj/clusterj-test/src/main/resources/META-INF/services/com.mysql.clusterj.core.spi.DomainTypeHandlerFactory
      storage/ndb/clusterj/clusterj-test/src/main/resources/schema.sql
      storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/Utility.java
 3421 Jonas Oreland	2011-07-05 [merge]
      ndb 55 - null merge copyright changes...

 3420 Jonas Oreland	2011-07-05
      ndb - more valgrind suppressions for compress

    modified:
      mysql-test/valgrind.supp
=== modified file 'storage/ndb/clusterj/clusterj-jdbc/src/main/antlr3/imports/MySQL51Functions.g'
--- a/storage/ndb/clusterj/clusterj-jdbc/src/main/antlr3/imports/MySQL51Functions.g	2011-03-15 21:48:21 +0000
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/main/antlr3/imports/MySQL51Functions.g	2011-07-05 12:54:14 +0000
@@ -1,3 +1,20 @@
+/*
+ *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; version 2 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+ */
+
 parser grammar MySQL51Functions;
 
 options {

=== modified file 'storage/ndb/clusterj/clusterj-test/src/main/resources/META-INF/services/com.mysql.clusterj.core.spi.DomainTypeHandlerFactory'
--- a/storage/ndb/clusterj/clusterj-test/src/main/resources/META-INF/services/com.mysql.clusterj.core.spi.DomainTypeHandlerFactory	2010-01-22 16:07:59 +0000
+++ b/storage/ndb/clusterj/clusterj-test/src/main/resources/META-INF/services/com.mysql.clusterj.core.spi.DomainTypeHandlerFactory	2011-07-05 12:54:14 +0000
@@ -1 +1 @@
-testsuite.clusterj.domaintypehandler.CrazyDomainTypeHandlerFactoryImpl
\ No newline at end of file
+testsuite.clusterj.domaintypehandler.CrazyDomainTypeHandlerFactoryImpl

=== modified file 'storage/ndb/clusterj/clusterj-test/src/main/resources/schema.sql'
--- a/storage/ndb/clusterj/clusterj-test/src/main/resources/schema.sql	2011-06-09 22:56:27 +0000
+++ b/storage/ndb/clusterj/clusterj-test/src/main/resources/schema.sql	2011-07-05 12:54:14 +0000
@@ -1,18 +1,3 @@
-#  Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; version 2 of the License.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-#
 # the first statement is a drop table for the test table
 drop table if exists t_basic;
 # the second statement is a test; if it succeeds, skip the rest of the file.

=== 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-29 18:02:39 +0000
+++ b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/Utility.java	2011-07-05 06:00:46 +0000
@@ -17,6 +17,7 @@
 
 package com.mysql.clusterj.tie;
 
+import java.lang.reflect.Method;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.math.RoundingMode;
@@ -107,7 +108,7 @@ public class Utility {
             return Class.forName(className);
         } catch (ClassNotFoundException e) {
             // TODO Auto-generated catch block
-            throw new ClusterJFatalInternalException(local.message("ERR_Loading_Native_Class", className), e);
+            throw new ClusterJUserException(local.message("ERR_Loading_Native_Class", className), e);
         }
     }
 
@@ -116,7 +117,27 @@ public class Utility {
     * actually a collation number. The CharsetMap interface thus has methods like
     * getCharsetNumber(String charsetName) but what is returned is actually a collation number.
     */
-    static CharsetMap charsetMap = CharsetMap.create();
+    static CharsetMap charsetMap = createCharsetMap();
+
+    // TODO: this is intended to investigate a class loader issue with Sparc java
+    // The idea is to create the CharsetMap create method in a try/catch block to report the exact error
+    static CharsetMap createCharsetMap() {
+        StringBuilder builder = new StringBuilder();
+        CharsetMap result = null;
+        try {
+            return CharsetMap.create();
+        } catch (Throwable t1) {
+            builder.append("CharsetMap.create() threw " + t1.getClass().getName() + ":" + t1.getMessage());
+            try {
+                Method charsetMapCreateMethod = charsetMapClass.getMethod("create", (Class[])null);
+                result = (CharsetMap)charsetMapCreateMethod.invoke(null, (Object[])null);
+                builder.append("charsetMapCreateMethod.invoke() succeeded:" + result);
+            } catch (Throwable t2) {
+                builder.append("charsetMapCreateMethod.invoke() threw " + t2.getClass().getName() + ":" + t2.getMessage());
+            }
+            throw new ClusterJUserException(builder.toString());
+        }
+    }
 
     /** The maximum mysql collation (charset) number. This is hard coded in <mysql>/include/my_sys.h */
     static int MAXIMUM_MYSQL_COLLATION_NUMBER = 256;

No bundle (reason: useless for push emails).