List:Commits« Previous MessageNext Message »
From:Martin Zaun Date:May 17 2012 1:46am
Subject:bzr push into mysql-5.1-telco-7.1 branch (martin.zaun:4543 to 4544)
View as plain text  
 4544 Martin Zaun	2012-05-16 [merge]
      merge from ndb-7.1-ndbjtie-minor-fixes

    modified:
      storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/DbImpl.java
      storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbInterpretedCode.java
      storage/ndb/src/ndbjtie/ndbapi_jtie.hpp
 4543 Craig L Russell	2012-05-16
      Fix bug in NdbRecord index scans where the buffers used in IndexBound were not strongly held.
      This allowed garbage collection to reuse the buffers before the index scan operation was defined.
      The result was that the index scan operation was defined with incorrect bounds, 
      which led to incorrect results, but also could have resulted in reading uninitialized memory.

    modified:
      storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordIndexScanOperationImpl.java
=== modified file 'storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/DbImpl.java'
--- a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/DbImpl.java	2012-05-06 13:55:09 +0000
+++ b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/DbImpl.java	2012-05-17 01:36:46 +0000
@@ -431,7 +431,7 @@ class DbImpl implements com.mysql.cluste
         IndexBound.delete(ndbIndexBound);
     }
 
-    public NdbInterpretedCode createInterpretedCode(TableConst ndbTable, int[] buffer, int i) {
+    public NdbInterpretedCode createInterpretedCode(TableConst ndbTable, ByteBuffer buffer, int i) {
         ++numberOfInterpretedCodeCreated;
         return NdbInterpretedCode.create(ndbTable, buffer, i);
     }

=== modified file 'storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbInterpretedCode.java'
--- a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbInterpretedCode.java	2011-06-30 16:04:23 +0000
+++ b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbInterpretedCode.java	2012-05-17 01:36:46 +0000
@@ -30,7 +30,7 @@ public class NdbInterpretedCode extends 
     public final native NdbDictionary.TableConst/*_const NdbDictionary.Table *_*/ getTable() /*_const_*/;
     public final native NdbErrorConst/*_const NdbError &_*/ getNdbError() /*_const_*/;
     public final native int/*_Uint32_*/ getWordsUsed() /*_const_*/;
-    static public final native NdbInterpretedCode create(NdbDictionary.TableConst/*_const NdbDictionary.Table *_*/ table /*_= 0_*/, int[]/*_Uint32 *_*/ buffer /*_= 0_*/, int/*_Uint32_*/ buffer_word_size /*_= 0_*/);
+    static public final native NdbInterpretedCode create(NdbDictionary.TableConst/*_const NdbDictionary.Table *_*/ table /*_= 0_*/, ByteBuffer/*_Uint32 *_*/ buffer /*_= 0_*/, int/*_Uint32_*/ buffer_word_size /*_= 0_*/);
     static public final native void delete(NdbInterpretedCode p0);
     public final native int load_const_null(int/*_Uint32_*/ RegDest);
     public final native int load_const_u16(int/*_Uint32_*/ RegDest, int/*_Uint32_*/ Constant);

=== modified file 'storage/ndb/src/ndbjtie/ndbapi_jtie.hpp'
--- a/storage/ndb/src/ndbjtie/ndbapi_jtie.hpp	2012-03-22 19:59:12 +0000
+++ b/storage/ndb/src/ndbjtie/ndbapi_jtie.hpp	2012-05-17 01:36:46 +0000
@@ -6566,7 +6566,7 @@ JNIEXPORT jobject JNICALL
 Java_com_mysql_ndbjtie_ndbapi_NdbInterpretedCode_create(JNIEnv * env, jclass cls, jobject p0, jintArray p1, jint p2)
 {
     TRACE("jobject Java_com_mysql_ndbjtie_ndbapi_NdbInterpretedCode_create(JNIEnv *, jclass, jobject, jintArray, jint)");
-    return gcreate< ttrait_c_m_n_n_NdbInterpretedCode_r, ttrait_c_m_n_n_NdbDictionary_Table_cp, ttrait_Uint32_0p_a, ttrait_Uint32 >(env, cls, p0, p1, p2);
+    return gcreate< ttrait_c_m_n_n_NdbInterpretedCode_r, ttrait_c_m_n_n_NdbDictionary_Table_cp, ttrait_Uint32_0p_bb, ttrait_Uint32 >(env, cls, p0, p1, p2);
 }
 
 /*

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.1-telco-7.1 branch (martin.zaun:4543 to 4544) Martin Zaun7 Jun