From: Martin Zaun Date: March 22 2012 8:03pm Subject: bzr push into mysql-5.1-telco-7.1 branch (martin.zaun:4494 to 4495) List-Archive: http://lists.mysql.com/commits/143291 Message-Id: <201203222003.q2MK3bXB022951@acsmt357.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 4495 Martin Zaun 2012-03-22 [merge] merge from ndb-7.1-ndbjtie to ndb-7.1 modified: .bzrignore storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbIndexScanOperation.java storage/ndb/src/ndbjtie/ndbapi_jtie.hpp 4494 Frazer Clement 2012-03-21 [merge] Merge 7.0->7.1 modified: mysql-test/suite/ndb/r/ndb_add_partition.result mysql-test/suite/ndb/t/ndb_add_partition.test mysql-test/suite/ndb/t/ndb_addnode.test sql/ha_ndbcluster.cc sql/handler.h sql/sql_table.cc storage/ndb/include/util/InputStream.hpp storage/ndb/src/common/transporter/Transporter.cpp storage/ndb/test/run-test/conf-blade08.cnf storage/ndb/test/run-test/conf-ndb07.cnf storage/ndb/test/run-test/conf-tyr13.cnf storage/ndb/test/run-test/daily-basic-tests.txt === modified file '.bzrignore' --- a/.bzrignore 2012-03-05 04:19:09 +0000 +++ b/.bzrignore 2012-03-22 19:59:12 +0000 @@ -3140,6 +3140,7 @@ storage/ndb/**/*.class storage/ndb/src/ndbjtie/**/*.sh storage/ndb/src/ndbjtie/**/*.log storage/ndb/src/ndbjtie/**/*.cmd +storage/ndb/src/ndbjtie/**/*_test storage/ndb/clusterj/**/*MANIFEST.MF storage/ndb/clusterj/**/*manifest.mf storage/ndb/test/crund/*.cnf === modified file 'storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbIndexScanOperation.java' --- a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbIndexScanOperation.java 2011-06-30 16:04:23 +0000 +++ b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbIndexScanOperation.java 2012-03-22 19:59:12 +0000 @@ -48,27 +48,27 @@ public class NdbIndexScanOperation exten public final native int get_range_no(); public interface /*_struct_*/ IndexBoundConst { - String/*_const char *_*/ low_key(); + ByteBuffer/*_const char *_*/ low_key(); int/*_Uint32_*/ low_key_count(); boolean low_inclusive(); - String/*_const char *_*/ high_key(); + ByteBuffer/*_const char *_*/ high_key(); int/*_Uint32_*/ high_key_count(); boolean high_inclusive(); int/*_Uint32_*/ range_no(); } static public class /*_struct_*/ IndexBound extends Wrapper implements IndexBoundConst { - public final native String/*_const char *_*/ low_key(); + public final native ByteBuffer/*_const char *_*/ low_key(); public final native int/*_Uint32_*/ low_key_count(); public final native boolean low_inclusive(); - public final native String/*_const char *_*/ high_key(); + public final native ByteBuffer/*_const char *_*/ high_key(); public final native int/*_Uint32_*/ high_key_count(); public final native boolean high_inclusive(); public final native int/*_Uint32_*/ range_no(); - public final native void low_key(String/*_const char *_*/ p0); + public final native void low_key(ByteBuffer/*_const char *_*/ p0); public final native void low_key_count(int/*_Uint32_*/ p0); public final native void low_inclusive(boolean p0); - public final native void high_key(String/*_const char *_*/ p0); + public final native void high_key(ByteBuffer/*_const char *_*/ p0); public final native void high_key_count(int/*_Uint32_*/ p0); public final native void high_inclusive(boolean p0); public final native void range_no(int/*_Uint32_*/ p0); === modified file 'storage/ndb/src/ndbjtie/ndbapi_jtie.hpp' --- a/storage/ndb/src/ndbjtie/ndbapi_jtie.hpp 2012-01-26 20:57:36 +0000 +++ b/storage/ndb/src/ndbjtie/ndbapi_jtie.hpp 2012-03-22 19:59:12 +0000 @@ -6316,13 +6316,13 @@ Java_com_mysql_ndbjtie_ndbapi_NdbIndexSc /* * Class: com_mysql_ndbjtie_ndbapi_NdbIndexScanOperation_IndexBound * Method: low_key - * Signature: ()Ljava/lang/String; + * Signature: ()Ljava/nio/ByteBuffer; */ -JNIEXPORT jstring JNICALL +JNIEXPORT jobject JNICALL Java_com_mysql_ndbjtie_ndbapi_NdbIndexScanOperation_00024IndexBound_low_1key__(JNIEnv * env, jobject obj) { - TRACE("jstring Java_com_mysql_ndbjtie_ndbapi_NdbIndexScanOperation_00024IndexBound_low_1key__(JNIEnv *, jobject)"); - return gget< ttrait_c_m_n_n_NdbIndexScanOperation_IndexBound_t, ttrait_char_cp_jutf8null, &NdbIndexScanOperation::IndexBound::low_key >(env, obj); + TRACE("jobject Java_com_mysql_ndbjtie_ndbapi_NdbIndexScanOperation_00024IndexBound_low_1key__(JNIEnv *, jobject)"); + return gget< ttrait_c_m_n_n_NdbIndexScanOperation_IndexBound_t, ttrait_char_0cp_bb, &NdbIndexScanOperation::IndexBound::low_key >(env, obj); } /* @@ -6352,13 +6352,13 @@ Java_com_mysql_ndbjtie_ndbapi_NdbIndexSc /* * Class: com_mysql_ndbjtie_ndbapi_NdbIndexScanOperation_IndexBound * Method: high_key - * Signature: ()Ljava/lang/String; + * Signature: ()Ljava/nio/ByteBuffer; */ -JNIEXPORT jstring JNICALL +JNIEXPORT jobject JNICALL Java_com_mysql_ndbjtie_ndbapi_NdbIndexScanOperation_00024IndexBound_high_1key__(JNIEnv * env, jobject obj) { - TRACE("jstring Java_com_mysql_ndbjtie_ndbapi_NdbIndexScanOperation_00024IndexBound_high_1key__(JNIEnv *, jobject)"); - return gget< ttrait_c_m_n_n_NdbIndexScanOperation_IndexBound_t, ttrait_char_cp_jutf8null, &NdbIndexScanOperation::IndexBound::high_key >(env, obj); + TRACE("jobject Java_com_mysql_ndbjtie_ndbapi_NdbIndexScanOperation_00024IndexBound_high_1key__(JNIEnv *, jobject)"); + return gget< ttrait_c_m_n_n_NdbIndexScanOperation_IndexBound_t, ttrait_char_0cp_bb, &NdbIndexScanOperation::IndexBound::high_key >(env, obj); } /* @@ -6400,13 +6400,13 @@ Java_com_mysql_ndbjtie_ndbapi_NdbIndexSc /* * Class: com_mysql_ndbjtie_ndbapi_NdbIndexScanOperation_IndexBound * Method: low_key - * Signature: (Ljava/lang/String;)V + * Signature: (Ljava/nio/ByteBuffer;)V */ JNIEXPORT void JNICALL -Java_com_mysql_ndbjtie_ndbapi_NdbIndexScanOperation_00024IndexBound_low_1key__Ljava_lang_String_2(JNIEnv * env, jobject obj, jstring p0) +Java_com_mysql_ndbjtie_ndbapi_NdbIndexScanOperation_00024IndexBound_low_1key__Ljava_nio_ByteBuffer_2(JNIEnv * env, jobject obj, jobject p0) { - TRACE("void Java_com_mysql_ndbjtie_ndbapi_NdbIndexScanOperation_00024IndexBound_low_1key__Ljava_lang_String_2(JNIEnv *, jobject, jstring)"); - gset< ttrait_c_m_n_n_NdbIndexScanOperation_IndexBound_t, ttrait_char_cp_jutf8null, &NdbIndexScanOperation::IndexBound::low_key >(env, obj, p0); + TRACE("void Java_com_mysql_ndbjtie_ndbapi_NdbIndexScanOperation_00024IndexBound_low_1key__Ljava_nio_ByteBuffer_2(JNIEnv *, jobject, jobject)"); + gset< ttrait_c_m_n_n_NdbIndexScanOperation_IndexBound_t, ttrait_char_0cp_bb, &NdbIndexScanOperation::IndexBound::low_key >(env, obj, p0); } /* @@ -6436,13 +6436,13 @@ Java_com_mysql_ndbjtie_ndbapi_NdbIndexSc /* * Class: com_mysql_ndbjtie_ndbapi_NdbIndexScanOperation_IndexBound * Method: high_key - * Signature: (Ljava/lang/String;)V + * Signature: (Ljava/nio/ByteBuffer;)V */ JNIEXPORT void JNICALL -Java_com_mysql_ndbjtie_ndbapi_NdbIndexScanOperation_00024IndexBound_high_1key__Ljava_lang_String_2(JNIEnv * env, jobject obj, jstring p0) +Java_com_mysql_ndbjtie_ndbapi_NdbIndexScanOperation_00024IndexBound_high_1key__Ljava_nio_ByteBuffer_2(JNIEnv * env, jobject obj, jobject p0) { - TRACE("void Java_com_mysql_ndbjtie_ndbapi_NdbIndexScanOperation_00024IndexBound_high_1key__Ljava_lang_String_2(JNIEnv *, jobject, jstring)"); - gset< ttrait_c_m_n_n_NdbIndexScanOperation_IndexBound_t, ttrait_char_cp_jutf8null, &NdbIndexScanOperation::IndexBound::high_key >(env, obj, p0); + TRACE("void Java_com_mysql_ndbjtie_ndbapi_NdbIndexScanOperation_00024IndexBound_high_1key__Ljava_nio_ByteBuffer_2(JNIEnv *, jobject, jobject)"); + gset< ttrait_c_m_n_n_NdbIndexScanOperation_IndexBound_t, ttrait_char_0cp_bb, &NdbIndexScanOperation::IndexBound::high_key >(env, obj, p0); } /* No bundle (reason: useless for push emails).