bzr push into mysql-5.1-telco-7.1 branch (martin.zaun:4617 to 4618)

[Martin Zaun]

 4618 Martin Zaun	2012-09-25 [merge]
      merge from ndb-7.1-jtie-array-fix

    modified:
      storage/ndb/src/ndbjtie/jtie/jtie_tconv_array_impl.hpp
 4617 Ole John Aske	2012-09-25 [merge]
      Merge 7.0 -> 7.1

    modified:
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
=== modified file 'storage/ndb/src/ndbjtie/jtie/jtie_tconv_array_impl.hpp'
--- a/storage/ndb/src/ndbjtie/jtie/jtie_tconv_array_impl.hpp	2011-02-02 09:52:33 +0000
+++ b/storage/ndb/src/ndbjtie/jtie/jtie_tconv_array_impl.hpp	2012-09-26 05:13:59 +0000
@@ -359,17 +359,17 @@ struct ObjectArrayConvImpl {
 private:
     // Returns a new Java Object array with all elements initialized to null;
     // in case of a NULL return, an exception is pending.
-    J *
+    static J *
     newJavaObjectArray(jclass cls, jsize n, JNIEnv * env);
     
     // Copies objects referred by a Java Object array over a C object array;
     // a non-zero return value indicates failure with an exception pending.
-    cstatus
+    static cstatus
     copyToCObjectArray(C * c, jobjectArray j, jsize n, JNIEnv * env);
 
     // Initializes a Java Object array with references from a C object array;
     // a non-zero return value indicates failure with an exception pending.
-    cstatus
+    static cstatus
     copyToJavaObjectArray(jobjectArray j, C * c, jsize n, JNIEnv * env);
 };
 

No bundle (reason: useless for push emails).