From: Martin Zaun Date: October 2 2010 6:07am Subject: bzr commit into mysql-5.1-telco-7.1 branch (martin.zaun:3859) List-Archive: http://lists.mysql.com/commits/119764 Message-Id: <201010020609.o925r8BU011944@acsinet15.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0173504640==" --===============0173504640== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///Users/mz/mysql/ndb-7.1-ndbjtie-fixes/ based on revid:jonas@stripped 3859 Martin Zaun 2010-10-01 ndbjtie - fixed mapping of NdbRecord-related functions. modified: storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbOperation.java storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbScanOperation.java storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbTransaction.java storage/ndb/src/ndbjtie/ndbapi_jtie.hpp storage/ndb/src/ndbjtie/ndbjtie_lib.cpp === modified file 'storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbOperation.java' --- a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbOperation.java 2010-04-18 17:41:22 +0000 +++ b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbOperation.java 2010-10-02 06:07:43 +0000 @@ -116,15 +116,6 @@ public class NdbOperation extends Wrappe static public final native SetValueSpec create(); static public final native void delete(SetValueSpec p0); } - static public interface OperationOptionsConstArray extends ArrayWrapper< OperationOptionsConst > - { - } - static public class OperationOptionsArray extends Wrapper implements OperationOptionsConstArray - { - static public native OperationOptionsArray create(int length); - static public native void delete(OperationOptionsArray e); - public native OperationOptions at(int i); - } public interface /*_struct_*/ OperationOptionsConst { long/*_Uint64_*/ optionsPresent(); === modified file 'storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbScanOperation.java' --- a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbScanOperation.java 2010-04-06 10:38:29 +0000 +++ b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbScanOperation.java 2010-10-02 06:07:43 +0000 @@ -39,15 +39,6 @@ public class NdbScanOperation extends Nd SF_MultiRange = 8<<24, SF_KeyInfo = 1; } - static public interface ScanOptionsConstArray extends ArrayWrapper< ScanOptionsConst > - { - } - static public class ScanOptionsArray extends Wrapper implements ScanOptionsConstArray - { - static public native ScanOptionsArray create(int length); - static public native void delete(ScanOptionsArray e); - public native ScanOptions at(int i); - } public interface /*_struct_*/ ScanOptionsConst { long/*_Uint64_*/ optionsPresent(); @@ -103,7 +94,7 @@ public class NdbScanOperation extends Nd public final native NdbOperation/*_NdbOperation *_*/ updateCurrentTuple(NdbTransaction/*_NdbTransaction *_*/ updateTrans); public final native int deleteCurrentTuple(); public final native int deleteCurrentTuple(NdbTransaction/*_NdbTransaction *_*/ takeOverTransaction); - public final native NdbOperationConst/*_const NdbOperation *_*/ lockCurrentTuple(NdbTransaction/*_NdbTransaction *_*/ takeOverTrans, NdbRecordConst/*_const NdbRecord *_*/ result_rec, ByteBuffer/*_char *_*/ result_row /*_= 0_*/, byte[]/*_const unsigned char *_*/ result_mask /*_= 0_*/, NdbOperation.OperationOptionsConstArray/*_const NdbOperation.OperationOptions *_*/ opts /*_= 0_*/, int/*_Uint32_*/ sizeOfOptions /*_= 0_*/); - public final native NdbOperationConst/*_const NdbOperation *_*/ updateCurrentTuple(NdbTransaction/*_NdbTransaction *_*/ takeOverTrans, NdbRecordConst/*_const NdbRecord *_*/ attr_rec, String/*_const char *_*/ attr_row, byte[]/*_const unsigned char *_*/ mask /*_= 0_*/, NdbOperation.OperationOptionsConstArray/*_const NdbOperation.OperationOptions *_*/ opts /*_= 0_*/, int/*_Uint32_*/ sizeOfOptions /*_= 0_*/); - public final native NdbOperationConst/*_const NdbOperation *_*/ deleteCurrentTuple(NdbTransaction/*_NdbTransaction *_*/ takeOverTrans, NdbRecordConst/*_const NdbRecord *_*/ result_rec, ByteBuffer/*_char *_*/ result_row /*_= 0_*/, byte[]/*_const unsigned char *_*/ result_mask /*_= 0_*/, NdbOperation.OperationOptionsConstArray/*_const NdbOperation.OperationOptions *_*/ opts /*_= 0_*/, int/*_Uint32_*/ sizeOfOptions /*_= 0_*/); + public final native NdbOperationConst/*_const NdbOperation *_*/ lockCurrentTuple(NdbTransaction/*_NdbTransaction *_*/ takeOverTrans, NdbRecordConst/*_const NdbRecord *_*/ result_rec, ByteBuffer/*_char *_*/ result_row /*_= 0_*/, byte[]/*_const unsigned char *_*/ result_mask /*_= 0_*/, NdbOperation.OperationOptionsConst/*_const NdbOperation.OperationOptions *_*/ opts /*_= 0_*/, int/*_Uint32_*/ sizeOfOptions /*_= 0_*/); + public final native NdbOperationConst/*_const NdbOperation *_*/ updateCurrentTuple(NdbTransaction/*_NdbTransaction *_*/ takeOverTrans, NdbRecordConst/*_const NdbRecord *_*/ attr_rec, String/*_const char *_*/ attr_row, byte[]/*_const unsigned char *_*/ mask /*_= 0_*/, NdbOperation.OperationOptionsConst/*_const NdbOperation.OperationOptions *_*/ opts /*_= 0_*/, int/*_Uint32_*/ sizeOfOptions /*_= 0_*/); + public final native NdbOperationConst/*_const NdbOperation *_*/ deleteCurrentTuple(NdbTransaction/*_NdbTransaction *_*/ takeOverTrans, NdbRecordConst/*_const NdbRecord *_*/ result_rec, ByteBuffer/*_char *_*/ result_row /*_= 0_*/, byte[]/*_const unsigned char *_*/ result_mask /*_= 0_*/, NdbOperation.OperationOptionsConst/*_const NdbOperation.OperationOptions *_*/ opts /*_= 0_*/, int/*_Uint32_*/ sizeOfOptions /*_= 0_*/); } === modified file 'storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbTransaction.java' --- a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbTransaction.java 2010-04-06 09:19:08 +0000 +++ b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbTransaction.java 2010-10-02 06:07:43 +0000 @@ -57,14 +57,14 @@ public class NdbTransaction extends Wrap } public final native int/*_CommitStatusType_*/ commitStatus(); public final native int getNdbErrorLine(); - public final native NdbOperationConst/*_const NdbOperation *_*/ readTuple(NdbRecordConst/*_const NdbRecord *_*/ key_rec, String/*_const char *_*/ key_row, NdbRecordConst/*_const NdbRecord *_*/ result_rec, ByteBuffer/*_char *_*/ result_row, int/*_NdbOperation.LockMode_*/ lock_mode /*_= NdbOperation.LM_Read_*/, byte[]/*_const unsigned char *_*/ result_mask /*_= 0_*/, NdbOperation.OperationOptionsConstArray/*_const NdbOperation.OperationOptions *_*/ opts /*_= 0_*/, int/*_Uint32_*/ sizeOfOptions /*_= 0_*/); - public final native NdbOperationConst/*_const NdbOperation *_*/ insertTuple(NdbRecordConst/*_const NdbRecord *_*/ key_rec, String/*_const char *_*/ key_row, NdbRecordConst/*_const NdbRecord *_*/ attr_rec, String/*_const char *_*/ attr_row, byte[]/*_const unsigned char *_*/ mask /*_= 0_*/, NdbOperation.OperationOptionsConstArray/*_const NdbOperation.OperationOptions *_*/ opts /*_= 0_*/, int/*_Uint32_*/ sizeOfOptions /*_= 0_*/); - public final native NdbOperationConst/*_const NdbOperation *_*/ insertTuple(NdbRecordConst/*_const NdbRecord *_*/ combined_rec, String/*_const char *_*/ combined_row, byte[]/*_const unsigned char *_*/ mask /*_= 0_*/, NdbOperation.OperationOptionsConstArray/*_const NdbOperation.OperationOptions *_*/ opts /*_= 0_*/, int/*_Uint32_*/ sizeOfOptions /*_= 0_*/); - public final native NdbOperationConst/*_const NdbOperation *_*/ updateTuple(NdbRecordConst/*_const NdbRecord *_*/ key_rec, String/*_const char *_*/ key_row, NdbRecordConst/*_const NdbRecord *_*/ attr_rec, String/*_const char *_*/ attr_row, byte[]/*_const unsigned char *_*/ mask /*_= 0_*/, NdbOperation.OperationOptionsConstArray/*_const NdbOperation.OperationOptions *_*/ opts /*_= 0_*/, int/*_Uint32_*/ sizeOfOptions /*_= 0_*/); - public final native NdbOperationConst/*_const NdbOperation *_*/ writeTuple(NdbRecordConst/*_const NdbRecord *_*/ key_rec, String/*_const char *_*/ key_row, NdbRecordConst/*_const NdbRecord *_*/ attr_rec, String/*_const char *_*/ attr_row, byte[]/*_const unsigned char *_*/ mask /*_= 0_*/, NdbOperation.OperationOptionsConstArray/*_const NdbOperation.OperationOptions *_*/ opts /*_= 0_*/, int/*_Uint32_*/ sizeOfOptions /*_= 0_*/); - public final native NdbOperationConst/*_const NdbOperation *_*/ deleteTuple(NdbRecordConst/*_const NdbRecord *_*/ key_rec, String/*_const char *_*/ key_row, NdbRecordConst/*_const NdbRecord *_*/ result_rec, ByteBuffer/*_char *_*/ result_row /*_= 0_*/, byte[]/*_const unsigned char *_*/ result_mask /*_= 0_*/, NdbOperation.OperationOptionsConstArray/*_const NdbOperation.OperationOptions *_*/ opts /*_= 0_*/, int/*_Uint32_*/ sizeOfOptions /*_= 0_*/); - public final native NdbScanOperation/*_NdbScanOperation *_*/ scanTable(NdbRecordConst/*_const NdbRecord *_*/ result_record, int/*_NdbOperation.LockMode_*/ lock_mode /*_= NdbOperation.LM_Read_*/, byte[]/*_const unsigned char *_*/ result_mask /*_= 0_*/, NdbScanOperation.ScanOptionsConstArray/*_const NdbScanOperation.ScanOptions *_*/ options /*_= 0_*/, int/*_Uint32_*/ sizeOfOptions /*_= 0_*/); - public final native NdbIndexScanOperation/*_NdbIndexScanOperation *_*/ scanIndex(NdbRecordConst/*_const NdbRecord *_*/ key_record, NdbRecordConst/*_const NdbRecord *_*/ result_record, int/*_NdbOperation.LockMode_*/ lock_mode /*_= NdbOperation.LM_Read_*/, byte[]/*_const unsigned char *_*/ result_mask /*_= 0_*/, NdbIndexScanOperation.IndexBoundConst/*_const NdbIndexScanOperation.IndexBound *_*/ bound /*_= 0_*/, NdbScanOperation.ScanOptionsConstArray/*_const NdbScanOperation.ScanOptions *_*/ options /*_= 0_*/, int/*_Uint32_*/ sizeOfOptions /*_= 0_*/); + public final native NdbOperationConst/*_const NdbOperation *_*/ readTuple(NdbRecordConst/*_const NdbRecord *_*/ key_rec, ByteBuffer/*_const char *_*/ key_row, NdbRecordConst/*_const NdbRecord *_*/ result_rec, ByteBuffer/*_char *_*/ result_row, int/*_NdbOperation.LockMode_*/ lock_mode /*_= NdbOperation.LM_Read_*/, byte[]/*_const unsigned char *_*/ result_mask /*_= 0_*/, NdbOperation.OperationOptionsConst/*_const NdbOperation.OperationOptions *_*/ opts /*_= 0_*/, int/*_Uint32_*/ sizeOfOptions /*_= 0_*/); + public final native NdbOperationConst/*_const NdbOperation *_*/ insertTuple(NdbRecordConst/*_const NdbRecord *_*/ key_rec, ByteBuffer/*_const char *_*/ key_row, NdbRecordConst/*_const NdbRecord *_*/ attr_rec, ByteBuffer/*_const char *_*/ attr_row, byte[]/*_const unsigned char *_*/ mask /*_= 0_*/, NdbOperation.OperationOptionsConst/*_const NdbOperation.OperationOptions *_*/ opts /*_= 0_*/, int/*_Uint32_*/ sizeOfOptions /*_= 0_*/); + public final native NdbOperationConst/*_const NdbOperation *_*/ insertTuple(NdbRecordConst/*_const NdbRecord *_*/ combined_rec, ByteBuffer/*_const char *_*/ combined_row, byte[]/*_const unsigned char *_*/ mask /*_= 0_*/, NdbOperation.OperationOptionsConst/*_const NdbOperation.OperationOptions *_*/ opts /*_= 0_*/, int/*_Uint32_*/ sizeOfOptions /*_= 0_*/); + public final native NdbOperationConst/*_const NdbOperation *_*/ updateTuple(NdbRecordConst/*_const NdbRecord *_*/ key_rec, ByteBuffer/*_const char *_*/ key_row, NdbRecordConst/*_const NdbRecord *_*/ attr_rec, ByteBuffer/*_const char *_*/ attr_row, byte[]/*_const unsigned char *_*/ mask /*_= 0_*/, NdbOperation.OperationOptionsConst/*_const NdbOperation.OperationOptions *_*/ opts /*_= 0_*/, int/*_Uint32_*/ sizeOfOptions /*_= 0_*/); + public final native NdbOperationConst/*_const NdbOperation *_*/ writeTuple(NdbRecordConst/*_const NdbRecord *_*/ key_rec, ByteBuffer/*_const char *_*/ key_row, NdbRecordConst/*_const NdbRecord *_*/ attr_rec, ByteBuffer/*_const char *_*/ attr_row, byte[]/*_const unsigned char *_*/ mask /*_= 0_*/, NdbOperation.OperationOptionsConst/*_const NdbOperation.OperationOptions *_*/ opts /*_= 0_*/, int/*_Uint32_*/ sizeOfOptions /*_= 0_*/); + public final native NdbOperationConst/*_const NdbOperation *_*/ deleteTuple(NdbRecordConst/*_const NdbRecord *_*/ key_rec, ByteBuffer/*_const char *_*/ key_row, NdbRecordConst/*_const NdbRecord *_*/ result_rec, ByteBuffer/*_char *_*/ result_row /*_= 0_*/, byte[]/*_const unsigned char *_*/ result_mask /*_= 0_*/, NdbOperation.OperationOptionsConst/*_const NdbOperation.OperationOptions *_*/ opts /*_= 0_*/, int/*_Uint32_*/ sizeOfOptions /*_= 0_*/); + public final native NdbScanOperation/*_NdbScanOperation *_*/ scanTable(NdbRecordConst/*_const NdbRecord *_*/ result_record, int/*_NdbOperation.LockMode_*/ lock_mode /*_= NdbOperation.LM_Read_*/, byte[]/*_const unsigned char *_*/ result_mask /*_= 0_*/, NdbScanOperation.ScanOptionsConst/*_const NdbScanOperation.ScanOptions *_*/ options /*_= 0_*/, int/*_Uint32_*/ sizeOfOptions /*_= 0_*/); + public final native NdbIndexScanOperation/*_NdbIndexScanOperation *_*/ scanIndex(NdbRecordConst/*_const NdbRecord *_*/ key_record, NdbRecordConst/*_const NdbRecord *_*/ result_record, int/*_NdbOperation.LockMode_*/ lock_mode /*_= NdbOperation.LM_Read_*/, byte[]/*_const unsigned char *_*/ result_mask /*_= 0_*/, NdbIndexScanOperation.IndexBoundConst/*_const NdbIndexScanOperation.IndexBound *_*/ bound /*_= 0_*/, NdbScanOperation.ScanOptionsConst/*_const NdbScanOperation.ScanOptions *_*/ options /*_= 0_*/, int/*_Uint32_*/ sizeOfOptions /*_= 0_*/); public final native NdbOperationConst/*_const NdbOperation *_*/ unlock(NdbLockHandleConst/*_const NdbLockHandle *_*/ lockHandle, int/*_NdbOperation::AbortOption_*/ ao /*_= NdbOperation::DefaultAbortOption_*/); public final native int releaseLockHandle(NdbLockHandleConst/*_const NdbLockHandle *_*/ lockHandle); } === modified file 'storage/ndb/src/ndbjtie/ndbapi_jtie.hpp' --- a/storage/ndb/src/ndbjtie/ndbapi_jtie.hpp 2010-04-19 05:33:10 +0000 +++ b/storage/ndb/src/ndbjtie/ndbapi_jtie.hpp 2010-10-02 06:07:43 +0000 @@ -102,8 +102,6 @@ JTIE_DEFINE_PEER_CLASS_MAPPING(NdbOperat c_m_n_n_NdbOperation_GetValueSpecArray) JTIE_DEFINE_PEER_CLASS_MAPPING(NdbOperation::OperationOptions, c_m_n_n_NdbOperation_OperationOptions) -JTIE_DEFINE_PEER_CLASS_MAPPING(NdbOperation::OperationOptions, - c_m_n_n_NdbOperation_OperationOptionsArray) JTIE_DEFINE_PEER_CLASS_MAPPING(NdbOperation::SetValueSpec, c_m_n_n_NdbOperation_SetValueSpec) JTIE_DEFINE_PEER_CLASS_MAPPING(NdbOperation::SetValueSpec, @@ -118,8 +116,6 @@ JTIE_DEFINE_PEER_CLASS_MAPPING(NdbScanOp c_m_n_n_NdbScanOperation) JTIE_DEFINE_PEER_CLASS_MAPPING(NdbScanOperation::ScanOptions, c_m_n_n_NdbScanOperation_ScanOptions) -JTIE_DEFINE_PEER_CLASS_MAPPING(NdbScanOperation::ScanOptions, - c_m_n_n_NdbScanOperation_ScanOptionsArray) JTIE_DEFINE_PEER_CLASS_MAPPING(NdbTransaction, c_m_n_n_NdbTransaction) JTIE_DEFINE_PEER_CLASS_MAPPING(Ndb::Key_part_ptr, @@ -8229,46 +8225,6 @@ Java_com_mysql_ndbjtie_ndbapi_NdbOperati // --------------------------------------------------------------------------- -//#include "com_mysql_ndbjtie_ndbapi_NdbOperation_OperationOptionsArray.h" - -/* - * Class: com_mysql_ndbjtie_ndbapi_NdbOperation_OperationOptionsArray - * Method: create - * Signature: (I)Lcom/mysql/ndbjtie/ndbapi/NdbOperation/OperationOptionsArray; - */ -JNIEXPORT jobject JNICALL -Java_com_mysql_ndbjtie_ndbapi_NdbOperation_00024OperationOptionsArray_create(JNIEnv * env, jclass cls, jint p0) -{ - TRACE("Java_com_mysql_ndbjtie_ndbapi_NdbOperation_00024OperationOptionsArray_create(JNIEnv *, jclass, jint)"); - return gcreateArray< ttrait_c_m_n_n_NdbOperation_OperationOptionsArray_r, ttrait_int32 >(env, cls, p0); -} - -/* - * Class: com_mysql_ndbjtie_ndbapi_NdbOperation_OperationOptionsArray - * Method: delete - * Signature: (Lcom/mysql/ndbjtie/ndbapi/NdbOperation/OperationOptionsArray;)V - */ -JNIEXPORT void JNICALL -Java_com_mysql_ndbjtie_ndbapi_NdbOperation_00024OperationOptionsArray_delete(JNIEnv * env, jclass cls, jobject p0) -{ - TRACE("Java_com_mysql_ndbjtie_ndbapi_NdbOperation_00024OperationOptionsArray_delete(JNIEnv *, jclass, jobject)"); - gdeleteArray< ttrait_c_m_n_n_NdbOperation_OperationOptionsArray_r >(env, cls, p0); -} - -/* - * Class: com_mysql_ndbjtie_ndbapi_NdbOperation_OperationOptionsArray - * Method: at - * Signature: (I)Lcom/mysql/ndbjtie/ndbapi/NdbOperation/OperationOptions; - */ -JNIEXPORT jobject JNICALL -Java_com_mysql_ndbjtie_ndbapi_NdbOperation_00024OperationOptionsArray_at(JNIEnv * env, jobject obj, jint p0) -{ - TRACE("Java_com_mysql_ndbjtie_ndbapi_NdbOperation_00024OperationOptionsArray_at(JNIEnv *, jobject, jint)"); - return gat< ttrait_c_m_n_n_NdbOperation_OperationOptions_r, ttrait_c_m_n_n_NdbOperation_OperationOptionsArray_r, ttrait_int32 >(env, NULL, obj, p0); -} - -// --------------------------------------------------------------------------- - //#include "com_mysql_ndbjtie_ndbapi_NdbOperation_SetValueSpec.h" /* @@ -9238,48 +9194,48 @@ Java_com_mysql_ndbjtie_ndbapi_NdbScanOpe /* * Class: com_mysql_ndbjtie_ndbapi_NdbScanOperation * Method: lockCurrentTuple - * Signature: (Lcom/mysql/ndbjtie/ndbapi/NdbTransaction;Lcom/mysql/ndbjtie/ndbapi/NdbRecordConst;Ljava/nio/ByteBuffer;[BLcom/mysql/ndbjtie/ndbapi/NdbOperation/OperationOptionsConstArray;I)Lcom/mysql/ndbjtie/ndbapi/NdbOperationConst; + * Signature: (Lcom/mysql/ndbjtie/ndbapi/NdbTransaction;Lcom/mysql/ndbjtie/ndbapi/NdbRecordConst;Ljava/nio/ByteBuffer;[BLcom/mysql/ndbjtie/ndbapi/NdbOperation/OperationOptionsConst;I)Lcom/mysql/ndbjtie/ndbapi/NdbOperationConst; */ JNIEXPORT jobject JNICALL -Java_com_mysql_ndbjtie_ndbapi_NdbScanOperation_lockCurrentTuple__Lcom_mysql_ndbjtie_ndbapi_NdbTransaction_2Lcom_mysql_ndbjtie_ndbapi_NdbRecordConst_2Ljava_nio_ByteBuffer_2_3BLcom_mysql_ndbjtie_ndbapi_NdbOperation_OperationOptionsConstArray_2I(JNIEnv * env, jobject obj, jobject p0, jobject p1, jobject p2, jbyteArray p3, jobjectArray p4, jint p5) +Java_com_mysql_ndbjtie_ndbapi_NdbScanOperation_lockCurrentTuple__Lcom_mysql_ndbjtie_ndbapi_NdbTransaction_2Lcom_mysql_ndbjtie_ndbapi_NdbRecordConst_2Ljava_nio_ByteBuffer_2_3BLcom_mysql_ndbjtie_ndbapi_NdbOperation_00024OperationOptionsConst_2I(JNIEnv * env, jobject obj, jobject p0, jobject p1, jobject p2, jbyteArray p3, jobject p4, jint p5) { - TRACE("jobject Java_com_mysql_ndbjtie_ndbapi_NdbScanOperation_lockCurrentTuple__Lcom_mysql_ndbjtie_ndbapi_NdbTransaction_2Lcom_mysql_ndbjtie_ndbapi_NdbRecordConst_2Ljava_nio_ByteBuffer_2_3BLcom_mysql_ndbjtie_ndbapi_NdbOperation_OperationOptionsConstArray_2I(JNIEnv *, jobject, jobject, jobject, jobject, jbyteArray, jobjectArray, jint)"); + TRACE("jobject Java_com_mysql_ndbjtie_ndbapi_NdbScanOperation_lockCurrentTuple__Lcom_mysql_ndbjtie_ndbapi_NdbTransaction_2Lcom_mysql_ndbjtie_ndbapi_NdbRecordConst_2Ljava_nio_ByteBuffer_2_3BLcom_mysql_ndbjtie_ndbapi_NdbOperation_00024OperationOptionsConst_2I(JNIEnv *, jobject, jobject, jobject, jobject, jbyteArray, jobject, jint)"); #ifndef NDBJTIE_USE_WRAPPED_VARIANT_FOR_FUNCTION - return gcall_mfr< ttrait_c_m_n_n_NdbScanOperation_t, ttrait_c_m_n_n_NdbOperation_cp, ttrait_c_m_n_n_NdbTransaction_p, ttrait_c_m_n_n_NdbRecord_cp, ttrait_char_1p_bb, ttrait_Uint8_0cp_a, ttrait_c_m_n_n_NdbOperation_OperationOptionsArray_cp/*_const NdbOperation.OperationOptions *_*/, ttrait_Uint32, &NdbScanOperation::lockCurrentTuple >(env, obj, p0, p1, p2, p3, p4, p5); + return gcall_mfr< ttrait_c_m_n_n_NdbScanOperation_t, ttrait_c_m_n_n_NdbOperation_cp, ttrait_c_m_n_n_NdbTransaction_p, ttrait_c_m_n_n_NdbRecord_cp, ttrait_char_1p_bb, ttrait_Uint8_0cp_a, ttrait_c_m_n_n_NdbOperation_OperationOptions_cp, ttrait_Uint32, &NdbScanOperation::lockCurrentTuple >(env, obj, p0, p1, p2, p3, p4, p5); #else - return gcall_fr< ttrait_c_m_n_n_NdbOperation_cp, ttrait_c_m_n_n_NdbScanOperation_r, ttrait_c_m_n_n_NdbTransaction_p, ttrait_c_m_n_n_NdbRecord_cp, ttrait_char_1p_bb, ttrait_Uint8_0cp_a, ttrait_c_m_n_n_NdbOperation_OperationOptionsArray_cp/*_const NdbOperation.OperationOptions *_*/, ttrait_Uint32, &NdbApiWrapper::NdbScanOperation__lockCurrentTuple >(env, NULL, obj, p0, p1, p2, p3, p4, p5); + return gcall_fr< ttrait_c_m_n_n_NdbOperation_cp, ttrait_c_m_n_n_NdbScanOperation_r, ttrait_c_m_n_n_NdbTransaction_p, ttrait_c_m_n_n_NdbRecord_cp, ttrait_char_1p_bb, ttrait_Uint8_0cp_a, ttrait_c_m_n_n_NdbOperation_OperationOptions_cp, ttrait_Uint32, &NdbApiWrapper::NdbScanOperation__lockCurrentTuple >(env, NULL, obj, p0, p1, p2, p3, p4, p5); #endif // NDBJTIE_USE_WRAPPED_VARIANT_FOR_FUNCTION } /* * Class: com_mysql_ndbjtie_ndbapi_NdbScanOperation * Method: updateCurrentTuple - * Signature: (Lcom/mysql/ndbjtie/ndbapi/NdbTransaction;Lcom/mysql/ndbjtie/ndbapi/NdbRecordConst;Ljava/lang/String;[BLcom/mysql/ndbjtie/ndbapi/NdbOperation/OperationOptionsConstArray;I)Lcom/mysql/ndbjtie/ndbapi/NdbOperationConst; + * Signature: (Lcom/mysql/ndbjtie/ndbapi/NdbTransaction;Lcom/mysql/ndbjtie/ndbapi/NdbRecordConst;Ljava/lang/String;[BLcom/mysql/ndbjtie/ndbapi/NdbOperation/OperationOptionsConst;I)Lcom/mysql/ndbjtie/ndbapi/NdbOperationConst; */ JNIEXPORT jobject JNICALL -Java_com_mysql_ndbjtie_ndbapi_NdbScanOperation_updateCurrentTuple__Lcom_mysql_ndbjtie_ndbapi_NdbTransaction_2Lcom_mysql_ndbjtie_ndbapi_NdbRecordConst_2Ljava_lang_String_2_3BLcom_mysql_ndbjtie_ndbapi_NdbOperation_OperationOptionsConstArray_2I(JNIEnv * env, jobject obj, jobject p0, jobject p1, jstring p2, jbyteArray p3, jobjectArray p4, jint p5) +Java_com_mysql_ndbjtie_ndbapi_NdbScanOperation_updateCurrentTuple__Lcom_mysql_ndbjtie_ndbapi_NdbTransaction_2Lcom_mysql_ndbjtie_ndbapi_NdbRecordConst_2Ljava_lang_String_2_3BLcom_mysql_ndbjtie_ndbapi_NdbOperation_00024OperationOptionsConst_2I(JNIEnv * env, jobject obj, jobject p0, jobject p1, jstring p2, jbyteArray p3, jobject p4, jint p5) { - TRACE("jobject Java_com_mysql_ndbjtie_ndbapi_NdbScanOperation_updateCurrentTuple__Lcom_mysql_ndbjtie_ndbapi_NdbTransaction_2Lcom_mysql_ndbjtie_ndbapi_NdbRecordConst_2Ljava_lang_String_2_3BLcom_mysql_ndbjtie_ndbapi_NdbOperation_OperationOptionsConstArray_2I(JNIEnv *, jobject, jobject, jobject, jstring, jbyteArray, jobjectArray, jint)"); + TRACE("jobject Java_com_mysql_ndbjtie_ndbapi_NdbScanOperation_updateCurrentTuple__Lcom_mysql_ndbjtie_ndbapi_NdbTransaction_2Lcom_mysql_ndbjtie_ndbapi_NdbRecordConst_2Ljava_lang_String_2_3BLcom_mysql_ndbjtie_ndbapi_NdbOperation_00024OperationOptionsConst_2I(JNIEnv *, jobject, jobject, jobject, jstring, jbyteArray, jobject, jint)"); #ifndef NDBJTIE_USE_WRAPPED_VARIANT_FOR_FUNCTION - return gcall_mfr< ttrait_c_m_n_n_NdbScanOperation_t, ttrait_c_m_n_n_NdbOperation_cp, ttrait_c_m_n_n_NdbTransaction_p, ttrait_c_m_n_n_NdbRecord_cp, ttrait_char_cp_jutf8null, ttrait_Uint8_0cp_a, ttrait_c_m_n_n_NdbOperation_OperationOptionsArray_cp/*_const NdbOperation.OperationOptions *_*/, ttrait_Uint32, &NdbScanOperation::updateCurrentTuple >(env, obj, p0, p1, p2, p3, p4, p5); + return gcall_mfr< ttrait_c_m_n_n_NdbScanOperation_t, ttrait_c_m_n_n_NdbOperation_cp, ttrait_c_m_n_n_NdbTransaction_p, ttrait_c_m_n_n_NdbRecord_cp, ttrait_char_cp_jutf8null, ttrait_Uint8_0cp_a, ttrait_c_m_n_n_NdbOperation_OperationOptions_cp, ttrait_Uint32, &NdbScanOperation::updateCurrentTuple >(env, obj, p0, p1, p2, p3, p4, p5); #else - return gcall_fr< ttrait_c_m_n_n_NdbOperation_cp, ttrait_c_m_n_n_NdbScanOperation_r, ttrait_c_m_n_n_NdbTransaction_p, ttrait_c_m_n_n_NdbRecord_cp, ttrait_char_cp_jutf8null, ttrait_Uint8_0cp_a, ttrait_c_m_n_n_NdbOperation_OperationOptionsArray_cp/*_const NdbOperation.OperationOptions *_*/, ttrait_Uint32, &NdbApiWrapper::NdbScanOperation__updateCurrentTuple >(env, NULL, obj, p0, p1, p2, p3, p4, p5); + return gcall_fr< ttrait_c_m_n_n_NdbOperation_cp, ttrait_c_m_n_n_NdbScanOperation_r, ttrait_c_m_n_n_NdbTransaction_p, ttrait_c_m_n_n_NdbRecord_cp, ttrait_char_cp_jutf8null, ttrait_Uint8_0cp_a, ttrait_c_m_n_n_NdbOperation_OperationOptions_cp, ttrait_Uint32, &NdbApiWrapper::NdbScanOperation__updateCurrentTuple >(env, NULL, obj, p0, p1, p2, p3, p4, p5); #endif // NDBJTIE_USE_WRAPPED_VARIANT_FOR_FUNCTION } /* * Class: com_mysql_ndbjtie_ndbapi_NdbScanOperation * Method: deleteCurrentTuple - * Signature: (Lcom/mysql/ndbjtie/ndbapi/NdbTransaction;Lcom/mysql/ndbjtie/ndbapi/NdbRecordConst;Ljava/nio/ByteBuffer;[BLcom/mysql/ndbjtie/ndbapi/NdbOperation/OperationOptionsConstArray;I)Lcom/mysql/ndbjtie/ndbapi/NdbOperationConst; + * Signature: (Lcom/mysql/ndbjtie/ndbapi/NdbTransaction;Lcom/mysql/ndbjtie/ndbapi/NdbRecordConst;Ljava/nio/ByteBuffer;[BLcom/mysql/ndbjtie/ndbapi/NdbOperation/OperationOptionsConst;I)Lcom/mysql/ndbjtie/ndbapi/NdbOperationConst; */ JNIEXPORT jobject JNICALL -Java_com_mysql_ndbjtie_ndbapi_NdbScanOperation_deleteCurrentTuple__Lcom_mysql_ndbjtie_ndbapi_NdbTransaction_2Lcom_mysql_ndbjtie_ndbapi_NdbRecordConst_2Ljava_nio_ByteBuffer_2_3BLcom_mysql_ndbjtie_ndbapi_NdbOperation_OperationOptionsConstArray_2I(JNIEnv * env, jobject obj, jobject p0, jobject p1, jobject p2, jbyteArray p3, jobjectArray p4, jint p5) +Java_com_mysql_ndbjtie_ndbapi_NdbScanOperation_deleteCurrentTuple__Lcom_mysql_ndbjtie_ndbapi_NdbTransaction_2Lcom_mysql_ndbjtie_ndbapi_NdbRecordConst_2Ljava_nio_ByteBuffer_2_3BLcom_mysql_ndbjtie_ndbapi_NdbOperation_00024OperationOptionsConst_2I(JNIEnv * env, jobject obj, jobject p0, jobject p1, jobject p2, jbyteArray p3, jobject p4, jint p5) { - TRACE("jobject Java_com_mysql_ndbjtie_ndbapi_NdbScanOperation_deleteCurrentTuple__Lcom_mysql_ndbjtie_ndbapi_NdbTransaction_2Lcom_mysql_ndbjtie_ndbapi_NdbRecordConst_2Ljava_nio_ByteBuffer_2_3BLcom_mysql_ndbjtie_ndbapi_NdbOperation_OperationOptionsConstArray_2I(JNIEnv *, jobject, jobject, jobject, jobject, jbyteArray, jobjectArray, jint)"); + TRACE("jobject Java_com_mysql_ndbjtie_ndbapi_NdbScanOperation_deleteCurrentTuple__Lcom_mysql_ndbjtie_ndbapi_NdbTransaction_2Lcom_mysql_ndbjtie_ndbapi_NdbRecordConst_2Ljava_nio_ByteBuffer_2_3BLcom_mysql_ndbjtie_ndbapi_NdbOperation_00024OperationOptionsConst_2I(JNIEnv *, jobject, jobject, jobject, jobject, jbyteArray, jobject, jint)"); #ifndef NDBJTIE_USE_WRAPPED_VARIANT_FOR_FUNCTION - return gcall_mfr< ttrait_c_m_n_n_NdbScanOperation_t, ttrait_c_m_n_n_NdbOperation_cp, ttrait_c_m_n_n_NdbTransaction_p, ttrait_c_m_n_n_NdbRecord_cp, ttrait_char_1p_bb, ttrait_Uint8_0cp_a, ttrait_c_m_n_n_NdbOperation_OperationOptionsArray_cp/*_const NdbOperation.OperationOptions *_*/, ttrait_Uint32, &NdbScanOperation::deleteCurrentTuple >(env, obj, p0, p1, p2, p3, p4, p5); + return gcall_mfr< ttrait_c_m_n_n_NdbScanOperation_t, ttrait_c_m_n_n_NdbOperation_cp, ttrait_c_m_n_n_NdbTransaction_p, ttrait_c_m_n_n_NdbRecord_cp, ttrait_char_1p_bb, ttrait_Uint8_0cp_a, ttrait_c_m_n_n_NdbOperation_OperationOptions_cp, ttrait_Uint32, &NdbScanOperation::deleteCurrentTuple >(env, obj, p0, p1, p2, p3, p4, p5); #else - return gcall_fr< ttrait_c_m_n_n_NdbOperation_cp, ttrait_c_m_n_n_NdbScanOperation_r, ttrait_c_m_n_n_NdbTransaction_p, ttrait_c_m_n_n_NdbRecord_cp, ttrait_char_1p_bb, ttrait_Uint8_0cp_a, ttrait_c_m_n_n_NdbOperation_OperationOptionsArray_cp/*_const NdbOperation.OperationOptions *_*/, ttrait_Uint32, &NdbApiWrapper::NdbScanOperation__deleteCurrentTuple >(env, NULL, obj, p0, p1, p2, p3, p4, p5); + return gcall_fr< ttrait_c_m_n_n_NdbOperation_cp, ttrait_c_m_n_n_NdbScanOperation_r, ttrait_c_m_n_n_NdbTransaction_p, ttrait_c_m_n_n_NdbRecord_cp, ttrait_char_1p_bb, ttrait_Uint8_0cp_a, ttrait_c_m_n_n_NdbOperation_OperationOptions_cp, ttrait_Uint32, &NdbApiWrapper::NdbScanOperation__deleteCurrentTuple >(env, NULL, obj, p0, p1, p2, p3, p4, p5); #endif // NDBJTIE_USE_WRAPPED_VARIANT_FOR_FUNCTION } @@ -9505,46 +9461,6 @@ Java_com_mysql_ndbjtie_ndbapi_NdbScanOpe // --------------------------------------------------------------------------- -//#include "com_mysql_ndbjtie_ndbapi_NdbScanOperation_ScanOptionsArray.h" - -/* - * Class: com_mysql_ndbjtie_ndbapi_NdbScanOperation_ScanOptionsArray - * Method: create - * Signature: (I)Lcom/mysql/ndbjtie/ndbapi/NdbScanOperation/ScanOptionsArray; - */ -JNIEXPORT jobject JNICALL -Java_com_mysql_ndbjtie_ndbapi_NdbScanOperation_00024ScanOptionsArray_create(JNIEnv * env, jclass cls, jint p0) -{ - TRACE("Java_com_mysql_ndbjtie_ndbapi_NdbScanOperation_00024ScanOptionsArray_create(JNIEnv *, jclass, jint)"); - return gcreateArray< ttrait_c_m_n_n_NdbScanOperation_ScanOptionsArray_r, ttrait_int32 >(env, cls, p0); -} - -/* - * Class: com_mysql_ndbjtie_ndbapi_NdbScanOperation_ScanOptionsArray - * Method: delete - * Signature: (Lcom/mysql/ndbjtie/ndbapi/NdbScanOperation/ScanOptionsArray;)V - */ -JNIEXPORT void JNICALL -Java_com_mysql_ndbjtie_ndbapi_NdbScanOperation_00024ScanOptionsArray_delete(JNIEnv * env, jclass cls, jobject p0) -{ - TRACE("Java_com_mysql_ndbjtie_ndbapi_NdbScanOperation_00024ScanOptionsArray_delete(JNIEnv *, jclass, jobject)"); - gdeleteArray< ttrait_c_m_n_n_NdbScanOperation_ScanOptionsArray_r >(env, cls, p0); -} - -/* - * Class: com_mysql_ndbjtie_ndbapi_NdbScanOperation_ScanOptionsArray - * Method: at - * Signature: (I)Lcom/mysql/ndbjtie/ndbapi/NdbScanOperation/ScanOptions; - */ -JNIEXPORT jobject JNICALL -Java_com_mysql_ndbjtie_ndbapi_NdbScanOperation_00024ScanOptionsArray_at(JNIEnv * env, jobject obj, jint p0) -{ - TRACE("Java_com_mysql_ndbjtie_ndbapi_NdbScanOperation_00024ScanOptionsArray_at(JNIEnv *, jobject, jint)"); - return gat< ttrait_c_m_n_n_NdbScanOperation_ScanOptions_r, ttrait_c_m_n_n_NdbScanOperation_ScanOptionsArray_r, ttrait_int32 >(env, NULL, obj, p0); -} - -// --------------------------------------------------------------------------- - //#include "com_mysql_ndbjtie_ndbapi_NdbTransaction.h" /* @@ -9774,128 +9690,128 @@ Java_com_mysql_ndbjtie_ndbapi_NdbTransac /* * Class: com_mysql_ndbjtie_ndbapi_NdbTransaction * Method: readTuple - * Signature: (Lcom/mysql/ndbjtie/ndbapi/NdbRecordConst;Ljava/lang/String;Lcom/mysql/ndbjtie/ndbapi/NdbRecordConst;Ljava/nio/ByteBuffer;I[BLcom/mysql/ndbjtie/ndbapi/NdbOperation/OperationOptionsConstArray;I)Lcom/mysql/ndbjtie/ndbapi/NdbOperationConst; + * Signature: (Lcom/mysql/ndbjtie/ndbapi/NdbRecordConst;Ljava/nio/ByteBuffer;Lcom/mysql/ndbjtie/ndbapi/NdbRecordConst;Ljava/nio/ByteBuffer;I[BLcom/mysql/ndbjtie/ndbapi/NdbOperation/OperationOptionsConst;I)Lcom/mysql/ndbjtie/ndbapi/NdbOperationConst; */ JNIEXPORT jobject JNICALL -Java_com_mysql_ndbjtie_ndbapi_NdbTransaction_readTuple(JNIEnv * env, jobject obj, jobject p0, jstring p1, jobject p2, jobject p3, jint p4, jbyteArray p5, jobjectArray p6, jint p7) +Java_com_mysql_ndbjtie_ndbapi_NdbTransaction_readTuple(JNIEnv * env, jobject obj, jobject p0, jobject p1, jobject p2, jobject p3, jint p4, jbyteArray p5, jobject p6, jint p7) { - TRACE("jobject Java_com_mysql_ndbjtie_ndbapi_NdbTransaction_readTuple(JNIEnv *, jobject, jobject, jstring, jobject, jobject, jint, jbyteArray, jobjectArray, jint)"); + TRACE("jobject Java_com_mysql_ndbjtie_ndbapi_NdbTransaction_readTuple(JNIEnv *, jobject, jobject, jobject, jobject, jobject, jint, jbyteArray, jobject, jint)"); #ifndef NDBJTIE_USE_WRAPPED_VARIANT_FOR_FUNCTION - return gcall_mfr< ttrait_c_m_n_n_NdbTransaction_t, ttrait_c_m_n_n_NdbOperation_cp, ttrait_c_m_n_n_NdbRecord_cp, ttrait_char_cp_jutf8null, ttrait_c_m_n_n_NdbRecord_cp, ttrait_char_1p_bb, ttrait_c_m_n_n_NdbOperation_LockMode_iv/*_enum_*/, ttrait_Uint8_0cp_a, ttrait_c_m_n_n_NdbOperation_OperationOptionsArray_cp/*_const NdbOperation.OperationOptions *_*/, ttrait_Uint32, &NdbTransaction::readTuple >(env, obj, p0, p1, p2, p3, p4, p5, p6, p7); + return gcall_mfr< ttrait_c_m_n_n_NdbTransaction_t, ttrait_c_m_n_n_NdbOperation_cp, ttrait_c_m_n_n_NdbRecord_cp, ttrait_char_1cp_bb, ttrait_c_m_n_n_NdbRecord_cp, ttrait_char_1p_bb, ttrait_c_m_n_n_NdbOperation_LockMode_iv/*_enum_*/, ttrait_Uint8_0cp_a, ttrait_c_m_n_n_NdbOperation_OperationOptions_cp, ttrait_Uint32, &NdbTransaction::readTuple >(env, obj, p0, p1, p2, p3, p4, p5, p6, p7); #else - return gcall_fr< ttrait_c_m_n_n_NdbOperation_cp, ttrait_c_m_n_n_NdbTransaction_r, ttrait_c_m_n_n_NdbRecord_cp, ttrait_char_cp_jutf8null, ttrait_c_m_n_n_NdbRecord_cp, ttrait_char_1p_bb, ttrait_c_m_n_n_NdbOperation_LockMode_iv/*_enum_*/, ttrait_Uint8_0cp_a, ttrait_c_m_n_n_NdbOperation_OperationOptionsArray_cp/*_const NdbOperation.OperationOptions *_*/, ttrait_Uint32, &NdbApiWrapper::NdbTransaction__readTuple >(env, NULL, obj, p0, p1, p2, p3, p4, p5, p6, p7); + return gcall_fr< ttrait_c_m_n_n_NdbOperation_cp, ttrait_c_m_n_n_NdbTransaction_r, ttrait_c_m_n_n_NdbRecord_cp, ttrait_char_1cp_bb, ttrait_c_m_n_n_NdbRecord_cp, ttrait_char_1p_bb, ttrait_c_m_n_n_NdbOperation_LockMode_iv/*_enum_*/, ttrait_Uint8_0cp_a, ttrait_c_m_n_n_NdbOperation_OperationOptions_cp, ttrait_Uint32, &NdbApiWrapper::NdbTransaction__readTuple >(env, NULL, obj, p0, p1, p2, p3, p4, p5, p6, p7); #endif // NDBJTIE_USE_WRAPPED_VARIANT_FOR_FUNCTION } /* * Class: com_mysql_ndbjtie_ndbapi_NdbTransaction * Method: insertTuple - * Signature: (Lcom/mysql/ndbjtie/ndbapi/NdbRecordConst;Ljava/lang/String;Lcom/mysql/ndbjtie/ndbapi/NdbRecordConst;Ljava/lang/String;[BLcom/mysql/ndbjtie/ndbapi/NdbOperation/OperationOptionsConstArray;I)Lcom/mysql/ndbjtie/ndbapi/NdbOperationConst; + * Signature: (Lcom/mysql/ndbjtie/ndbapi/NdbRecordConst;Ljava/nio/ByteBuffer;Lcom/mysql/ndbjtie/ndbapi/NdbRecordConst;Ljava/nio/ByteBuffer;[BLcom/mysql/ndbjtie/ndbapi/NdbOperation/OperationOptionsConst;I)Lcom/mysql/ndbjtie/ndbapi/NdbOperationConst; */ JNIEXPORT jobject JNICALL -Java_com_mysql_ndbjtie_ndbapi_NdbTransaction_insertTuple__Lcom_mysql_ndbjtie_ndbapi_NdbRecordConst_2Ljava_lang_String_2Lcom_mysql_ndbjtie_ndbapi_NdbRecordConst_2Ljava_lang_String_2_3BLcom_mysql_ndbjtie_ndbapi_NdbOperation_OperationOptionsConstArray_2I(JNIEnv * env, jobject obj, jobject p0, jstring p1, jobject p2, jstring p3, jbyteArray p4, jobjectArray p5, jint p6) +Java_com_mysql_ndbjtie_ndbapi_NdbTransaction_insertTuple__Lcom_mysql_ndbjtie_ndbapi_NdbRecordConst_2Ljava_nio_ByteBuffer_2Lcom_mysql_ndbjtie_ndbapi_NdbRecordConst_2Ljava_nio_ByteBuffer_2_3BLcom_mysql_ndbjtie_ndbapi_NdbOperation_00024OperationOptionsConst_2I(JNIEnv * env, jobject obj, jobject p0, jobject p1, jobject p2, jobject p3, jbyteArray p4, jobject p5, jint p6) { - TRACE("jobject Java_com_mysql_ndbjtie_ndbapi_NdbTransaction_insertTuple__Lcom_mysql_ndbjtie_ndbapi_NdbRecordConst_2Ljava_lang_String_2Lcom_mysql_ndbjtie_ndbapi_NdbRecordConst_2Ljava_lang_String_2_3BLcom_mysql_ndbjtie_ndbapi_NdbOperation_OperationOptionsConstArray_2I(JNIEnv *, jobject, jobject, jstring, jobject, jstring, jbyteArray, jobjectArray, jint)"); + TRACE("jobject Java_com_mysql_ndbjtie_ndbapi_NdbTransaction_insertTuple__Lcom_mysql_ndbjtie_ndbapi_NdbRecordConst_2Ljava_nio_ByteBuffer_2Lcom_mysql_ndbjtie_ndbapi_NdbRecordConst_2Ljava_nio_ByteBuffer_2_3BLcom_mysql_ndbjtie_ndbapi_NdbOperation_00024OperationOptionsConst_2I(JNIEnv *, jobject, jobject, jobject, jobject, jobject, jbyteArray, jobject, jint)"); #ifndef NDBJTIE_USE_WRAPPED_VARIANT_FOR_FUNCTION - return gcall_mfr< ttrait_c_m_n_n_NdbTransaction_t, ttrait_c_m_n_n_NdbOperation_cp, ttrait_c_m_n_n_NdbRecord_cp, ttrait_char_cp_jutf8null, ttrait_c_m_n_n_NdbRecord_cp, ttrait_char_cp_jutf8null, ttrait_Uint8_0cp_a, ttrait_c_m_n_n_NdbOperation_OperationOptionsArray_cp/*_const NdbOperation.OperationOptions *_*/, ttrait_Uint32, &NdbTransaction::insertTuple >(env, obj, p0, p1, p2, p3, p4, p5, p6); + return gcall_mfr< ttrait_c_m_n_n_NdbTransaction_t, ttrait_c_m_n_n_NdbOperation_cp, ttrait_c_m_n_n_NdbRecord_cp, ttrait_char_1cp_bb, ttrait_c_m_n_n_NdbRecord_cp, ttrait_char_1cp_bb, ttrait_Uint8_0cp_a, ttrait_c_m_n_n_NdbOperation_OperationOptions_cp, ttrait_Uint32, &NdbTransaction::insertTuple >(env, obj, p0, p1, p2, p3, p4, p5, p6); #else - return gcall_fr< ttrait_c_m_n_n_NdbOperation_cp, ttrait_c_m_n_n_NdbTransaction_r, ttrait_c_m_n_n_NdbRecord_cp, ttrait_char_cp_jutf8null, ttrait_c_m_n_n_NdbRecord_cp, ttrait_char_cp_jutf8null, ttrait_Uint8_0cp_a, ttrait_c_m_n_n_NdbOperation_OperationOptionsArray_cp/*_const NdbOperation.OperationOptions *_*/, ttrait_Uint32, &NdbApiWrapper::NdbTransaction__insertTuple__0 >(env, NULL, obj, p0, p1, p2, p3, p4, p5, p6); + return gcall_fr< ttrait_c_m_n_n_NdbOperation_cp, ttrait_c_m_n_n_NdbTransaction_r, ttrait_c_m_n_n_NdbRecord_cp, ttrait_char_1cp_bb, ttrait_c_m_n_n_NdbRecord_cp, ttrait_char_1cp_bb, ttrait_Uint8_0cp_a, ttrait_c_m_n_n_NdbOperation_OperationOptions_cp, ttrait_Uint32, &NdbApiWrapper::NdbTransaction__insertTuple__0 >(env, NULL, obj, p0, p1, p2, p3, p4, p5, p6); #endif // NDBJTIE_USE_WRAPPED_VARIANT_FOR_FUNCTION } /* * Class: com_mysql_ndbjtie_ndbapi_NdbTransaction * Method: insertTuple - * Signature: (Lcom/mysql/ndbjtie/ndbapi/NdbRecordConst;Ljava/lang/String;[BLcom/mysql/ndbjtie/ndbapi/NdbOperation/OperationOptionsConstArray;I)Lcom/mysql/ndbjtie/ndbapi/NdbOperationConst; + * Signature: (Lcom/mysql/ndbjtie/ndbapi/NdbRecordConst;Ljava/nio/ByteBuffer;[BLcom/mysql/ndbjtie/ndbapi/NdbOperation/OperationOptionsConst;I)Lcom/mysql/ndbjtie/ndbapi/NdbOperationConst; */ JNIEXPORT jobject JNICALL -Java_com_mysql_ndbjtie_ndbapi_NdbTransaction_insertTuple__Lcom_mysql_ndbjtie_ndbapi_NdbRecordConst_2Ljava_lang_String_2_3BLcom_mysql_ndbjtie_ndbapi_NdbOperation_OperationOptionsConstArray_2I(JNIEnv * env, jobject obj, jobject p0, jstring p1, jbyteArray p2, jobjectArray p3, jint p4) +Java_com_mysql_ndbjtie_ndbapi_NdbTransaction_insertTuple__Lcom_mysql_ndbjtie_ndbapi_NdbRecordConst_2Ljava_nio_ByteBuffer_2_3BLcom_mysql_ndbjtie_ndbapi_NdbOperation_00024OperationOptionsConst_2I(JNIEnv * env, jobject obj, jobject p0, jobject p1, jbyteArray p2, jobject p3, jint p4) { - TRACE("jobject Java_com_mysql_ndbjtie_ndbapi_NdbTransaction_insertTuple__Lcom_mysql_ndbjtie_ndbapi_NdbRecordConst_2Ljava_lang_String_2_3BLcom_mysql_ndbjtie_ndbapi_NdbOperation_OperationOptionsConstArray_2I(JNIEnv *, jobject, jobject, jstring, jbyteArray, jobjectArray, jint)"); + TRACE("jobject Java_com_mysql_ndbjtie_ndbapi_NdbTransaction_insertTuple__Lcom_mysql_ndbjtie_ndbapi_NdbRecordConst_2Ljava_nio_ByteBuffer_2_3BLcom_mysql_ndbjtie_ndbapi_NdbOperation_00024OperationOptionsConst_2I(JNIEnv *, jobject, jobject, jobject, jbyteArray, jobject, jint)"); #ifndef NDBJTIE_USE_WRAPPED_VARIANT_FOR_FUNCTION - return gcall_mfr< ttrait_c_m_n_n_NdbTransaction_t, ttrait_c_m_n_n_NdbOperation_cp, ttrait_c_m_n_n_NdbRecord_cp, ttrait_char_cp_jutf8null, ttrait_Uint8_0cp_a, ttrait_c_m_n_n_NdbOperation_OperationOptionsArray_cp/*_const NdbOperation.OperationOptions *_*/, ttrait_Uint32, &NdbTransaction::insertTuple >(env, obj, p0, p1, p2, p3, p4); + return gcall_mfr< ttrait_c_m_n_n_NdbTransaction_t, ttrait_c_m_n_n_NdbOperation_cp, ttrait_c_m_n_n_NdbRecord_cp, ttrait_char_1cp_bb, ttrait_Uint8_0cp_a, ttrait_c_m_n_n_NdbOperation_OperationOptions_cp, ttrait_Uint32, &NdbTransaction::insertTuple >(env, obj, p0, p1, p2, p3, p4); #else - return gcall_fr< ttrait_c_m_n_n_NdbOperation_cp, ttrait_c_m_n_n_NdbTransaction_r, ttrait_c_m_n_n_NdbRecord_cp, ttrait_char_cp_jutf8null, ttrait_Uint8_0cp_a, ttrait_c_m_n_n_NdbOperation_OperationOptionsArray_cp/*_const NdbOperation.OperationOptions *_*/, ttrait_Uint32, &NdbApiWrapper::NdbTransaction__insertTuple__1 >(env, NULL, obj, p0, p1, p2, p3, p4); + return gcall_fr< ttrait_c_m_n_n_NdbOperation_cp, ttrait_c_m_n_n_NdbTransaction_r, ttrait_c_m_n_n_NdbRecord_cp, ttrait_char_1cp_bb, ttrait_Uint8_0cp_a, ttrait_c_m_n_n_NdbOperation_OperationOptions_cp, ttrait_Uint32, &NdbApiWrapper::NdbTransaction__insertTuple__1 >(env, NULL, obj, p0, p1, p2, p3, p4); #endif // NDBJTIE_USE_WRAPPED_VARIANT_FOR_FUNCTION } /* * Class: com_mysql_ndbjtie_ndbapi_NdbTransaction * Method: updateTuple - * Signature: (Lcom/mysql/ndbjtie/ndbapi/NdbRecordConst;Ljava/lang/String;Lcom/mysql/ndbjtie/ndbapi/NdbRecordConst;Ljava/lang/String;[BLcom/mysql/ndbjtie/ndbapi/NdbOperation/OperationOptionsConstArray;I)Lcom/mysql/ndbjtie/ndbapi/NdbOperationConst; + * Signature: (Lcom/mysql/ndbjtie/ndbapi/NdbRecordConst;Ljava/nio/ByteBuffer;Lcom/mysql/ndbjtie/ndbapi/NdbRecordConst;Ljava/nio/ByteBuffer;[BLcom/mysql/ndbjtie/ndbapi/NdbOperation/OperationOptionsConst;I)Lcom/mysql/ndbjtie/ndbapi/NdbOperationConst; */ JNIEXPORT jobject JNICALL -Java_com_mysql_ndbjtie_ndbapi_NdbTransaction_updateTuple(JNIEnv * env, jobject obj, jobject p0, jstring p1, jobject p2, jstring p3, jbyteArray p4, jobjectArray p5, jint p6) +Java_com_mysql_ndbjtie_ndbapi_NdbTransaction_updateTuple(JNIEnv * env, jobject obj, jobject p0, jobject p1, jobject p2, jobject p3, jbyteArray p4, jobject p5, jint p6) { - TRACE("jobject Java_com_mysql_ndbjtie_ndbapi_NdbTransaction_updateTuple(JNIEnv *, jobject, jobject, jstring, jobject, jstring, jbyteArray, jobjectArray, jint)"); + TRACE("jobject Java_com_mysql_ndbjtie_ndbapi_NdbTransaction_updateTuple(JNIEnv *, jobject, jobject, jobject, jobject, jobject, jbyteArray, jobject, jint)"); #ifndef NDBJTIE_USE_WRAPPED_VARIANT_FOR_FUNCTION - return gcall_mfr< ttrait_c_m_n_n_NdbTransaction_t, ttrait_c_m_n_n_NdbOperation_cp, ttrait_c_m_n_n_NdbRecord_cp, ttrait_char_cp_jutf8null, ttrait_c_m_n_n_NdbRecord_cp, ttrait_char_cp_jutf8null, ttrait_Uint8_0cp_a, ttrait_c_m_n_n_NdbOperation_OperationOptionsArray_cp/*_const NdbOperation.OperationOptions *_*/, ttrait_Uint32, &NdbTransaction::updateTuple >(env, obj, p0, p1, p2, p3, p4, p5, p6); + return gcall_mfr< ttrait_c_m_n_n_NdbTransaction_t, ttrait_c_m_n_n_NdbOperation_cp, ttrait_c_m_n_n_NdbRecord_cp, ttrait_char_1cp_bb, ttrait_c_m_n_n_NdbRecord_cp, ttrait_char_1cp_bb, ttrait_Uint8_0cp_a, ttrait_c_m_n_n_NdbOperation_OperationOptions_cp, ttrait_Uint32, &NdbTransaction::updateTuple >(env, obj, p0, p1, p2, p3, p4, p5, p6); #else - return gcall_fr< ttrait_c_m_n_n_NdbOperation_cp, ttrait_c_m_n_n_NdbTransaction_r, ttrait_c_m_n_n_NdbRecord_cp, ttrait_char_cp_jutf8null, ttrait_c_m_n_n_NdbRecord_cp, ttrait_char_cp_jutf8null, ttrait_Uint8_0cp_a, ttrait_c_m_n_n_NdbOperation_OperationOptionsArray_cp/*_const NdbOperation.OperationOptions *_*/, ttrait_Uint32, &NdbApiWrapper::NdbTransaction__updateTuple >(env, NULL, obj, p0, p1, p2, p3, p4, p5, p6); + return gcall_fr< ttrait_c_m_n_n_NdbOperation_cp, ttrait_c_m_n_n_NdbTransaction_r, ttrait_c_m_n_n_NdbRecord_cp, ttrait_char_1cp_bb, ttrait_c_m_n_n_NdbRecord_cp, ttrait_char_1cp_bb, ttrait_Uint8_0cp_a, ttrait_c_m_n_n_NdbOperation_OperationOptions_cp, ttrait_Uint32, &NdbApiWrapper::NdbTransaction__updateTuple >(env, NULL, obj, p0, p1, p2, p3, p4, p5, p6); #endif // NDBJTIE_USE_WRAPPED_VARIANT_FOR_FUNCTION } /* * Class: com_mysql_ndbjtie_ndbapi_NdbTransaction * Method: writeTuple - * Signature: (Lcom/mysql/ndbjtie/ndbapi/NdbRecordConst;Ljava/lang/String;Lcom/mysql/ndbjtie/ndbapi/NdbRecordConst;Ljava/lang/String;[BLcom/mysql/ndbjtie/ndbapi/NdbOperation/OperationOptionsConstArray;I)Lcom/mysql/ndbjtie/ndbapi/NdbOperationConst; + * Signature: (Lcom/mysql/ndbjtie/ndbapi/NdbRecordConst;Ljava/nio/ByteBuffer;Lcom/mysql/ndbjtie/ndbapi/NdbRecordConst;Ljava/nio/ByteBuffer;[BLcom/mysql/ndbjtie/ndbapi/NdbOperation/OperationOptionsConst;I)Lcom/mysql/ndbjtie/ndbapi/NdbOperationConst; */ JNIEXPORT jobject JNICALL -Java_com_mysql_ndbjtie_ndbapi_NdbTransaction_writeTuple(JNIEnv * env, jobject obj, jobject p0, jstring p1, jobject p2, jstring p3, jbyteArray p4, jobjectArray p5, jint p6) +Java_com_mysql_ndbjtie_ndbapi_NdbTransaction_writeTuple(JNIEnv * env, jobject obj, jobject p0, jobject p1, jobject p2, jobject p3, jbyteArray p4, jobject p5, jint p6) { - TRACE("jobject Java_com_mysql_ndbjtie_ndbapi_NdbTransaction_writeTuple(JNIEnv *, jobject, jobject, jstring, jobject, jstring, jbyteArray, jobjectArray, jint)"); + TRACE("jobject Java_com_mysql_ndbjtie_ndbapi_NdbTransaction_writeTuple(JNIEnv *, jobject, jobject, jobject, jobject, jobject, jbyteArray, jobject, jint)"); #ifndef NDBJTIE_USE_WRAPPED_VARIANT_FOR_FUNCTION - return gcall_mfr< ttrait_c_m_n_n_NdbTransaction_t, ttrait_c_m_n_n_NdbOperation_cp, ttrait_c_m_n_n_NdbRecord_cp, ttrait_char_cp_jutf8null, ttrait_c_m_n_n_NdbRecord_cp, ttrait_char_cp_jutf8null, ttrait_Uint8_0cp_a, ttrait_c_m_n_n_NdbOperation_OperationOptionsArray_cp/*_const NdbOperation.OperationOptions *_*/, ttrait_Uint32, &NdbTransaction::writeTuple >(env, obj, p0, p1, p2, p3, p4, p5, p6); + return gcall_mfr< ttrait_c_m_n_n_NdbTransaction_t, ttrait_c_m_n_n_NdbOperation_cp, ttrait_c_m_n_n_NdbRecord_cp, ttrait_char_1cp_bb, ttrait_c_m_n_n_NdbRecord_cp, ttrait_char_1cp_bb, ttrait_Uint8_0cp_a, ttrait_c_m_n_n_NdbOperation_OperationOptions_cp, ttrait_Uint32, &NdbTransaction::writeTuple >(env, obj, p0, p1, p2, p3, p4, p5, p6); #else - return gcall_fr< ttrait_c_m_n_n_NdbOperation_cp, ttrait_c_m_n_n_NdbTransaction_r, ttrait_c_m_n_n_NdbRecord_cp, ttrait_char_cp_jutf8null, ttrait_c_m_n_n_NdbRecord_cp, ttrait_char_cp_jutf8null, ttrait_Uint8_0cp_a, ttrait_c_m_n_n_NdbOperation_OperationOptionsArray_cp/*_const NdbOperation.OperationOptions *_*/, ttrait_Uint32, &NdbApiWrapper::NdbTransaction__writeTuple >(env, NULL, obj, p0, p1, p2, p3, p4, p5, p6); + return gcall_fr< ttrait_c_m_n_n_NdbOperation_cp, ttrait_c_m_n_n_NdbTransaction_r, ttrait_c_m_n_n_NdbRecord_cp, ttrait_char_1cp_bb, ttrait_c_m_n_n_NdbRecord_cp, ttrait_char_1cp_bb, ttrait_Uint8_0cp_a, ttrait_c_m_n_n_NdbOperation_OperationOptions_cp, ttrait_Uint32, &NdbApiWrapper::NdbTransaction__writeTuple >(env, NULL, obj, p0, p1, p2, p3, p4, p5, p6); #endif // NDBJTIE_USE_WRAPPED_VARIANT_FOR_FUNCTION } /* * Class: com_mysql_ndbjtie_ndbapi_NdbTransaction * Method: deleteTuple - * Signature: (Lcom/mysql/ndbjtie/ndbapi/NdbRecordConst;Ljava/lang/String;Lcom/mysql/ndbjtie/ndbapi/NdbRecordConst;Ljava/nio/ByteBuffer;[BLcom/mysql/ndbjtie/ndbapi/NdbOperation/OperationOptionsConstArray;I)Lcom/mysql/ndbjtie/ndbapi/NdbOperationConst; + * Signature: (Lcom/mysql/ndbjtie/ndbapi/NdbRecordConst;Ljava/nio/ByteBuffer;Lcom/mysql/ndbjtie/ndbapi/NdbRecordConst;Ljava/nio/ByteBuffer;[BLcom/mysql/ndbjtie/ndbapi/NdbOperation/OperationOptionsConst;I)Lcom/mysql/ndbjtie/ndbapi/NdbOperationConst; */ JNIEXPORT jobject JNICALL -Java_com_mysql_ndbjtie_ndbapi_NdbTransaction_deleteTuple(JNIEnv * env, jobject obj, jobject p0, jstring p1, jobject p2, jobject p3, jbyteArray p4, jobjectArray p5, jint p6) +Java_com_mysql_ndbjtie_ndbapi_NdbTransaction_deleteTuple(JNIEnv * env, jobject obj, jobject p0, jobject p1, jobject p2, jobject p3, jbyteArray p4, jobject p5, jint p6) { - TRACE("jobject Java_com_mysql_ndbjtie_ndbapi_NdbTransaction_deleteTuple(JNIEnv *, jobject, jobject, jstring, jobject, jobject, jbyteArray, jobjectArray, jint)"); + TRACE("jobject Java_com_mysql_ndbjtie_ndbapi_NdbTransaction_deleteTuple(JNIEnv *, jobject, jobject, jobject, jobject, jobject, jbyteArray, jobject, jint)"); #ifndef NDBJTIE_USE_WRAPPED_VARIANT_FOR_FUNCTION - return gcall_mfr< ttrait_c_m_n_n_NdbTransaction_t, ttrait_c_m_n_n_NdbOperation_cp, ttrait_c_m_n_n_NdbRecord_cp, ttrait_char_cp_jutf8null, ttrait_c_m_n_n_NdbRecord_cp, ttrait_char_1p_bb, ttrait_Uint8_0cp_a, ttrait_c_m_n_n_NdbOperation_OperationOptionsArray_cp/*_const NdbOperation.OperationOptions *_*/, ttrait_Uint32, &NdbTransaction::deleteTuple >(env, obj, p0, p1, p2, p3, p4, p5, p6); + return gcall_mfr< ttrait_c_m_n_n_NdbTransaction_t, ttrait_c_m_n_n_NdbOperation_cp, ttrait_c_m_n_n_NdbRecord_cp, ttrait_char_1cp_bb, ttrait_c_m_n_n_NdbRecord_cp, ttrait_char_1p_bb, ttrait_Uint8_0cp_a, ttrait_c_m_n_n_NdbOperation_OperationOptions_cp, ttrait_Uint32, &NdbTransaction::deleteTuple >(env, obj, p0, p1, p2, p3, p4, p5, p6); #else - return gcall_fr< ttrait_c_m_n_n_NdbOperation_cp, ttrait_c_m_n_n_NdbTransaction_r, ttrait_c_m_n_n_NdbRecord_cp, ttrait_char_cp_jutf8null, ttrait_c_m_n_n_NdbRecord_cp, ttrait_char_1p_bb, ttrait_Uint8_0cp_a, ttrait_c_m_n_n_NdbOperation_OperationOptionsArray_cp/*_const NdbOperation.OperationOptions *_*/, ttrait_Uint32, &NdbApiWrapper::NdbTransaction__deleteTuple >(env, NULL, obj, p0, p1, p2, p3, p4, p5, p6); + return gcall_fr< ttrait_c_m_n_n_NdbOperation_cp, ttrait_c_m_n_n_NdbTransaction_r, ttrait_c_m_n_n_NdbRecord_cp, ttrait_char_1cp_bb, ttrait_c_m_n_n_NdbRecord_cp, ttrait_char_1p_bb, ttrait_Uint8_0cp_a, ttrait_c_m_n_n_NdbOperation_OperationOptions_cp, ttrait_Uint32, &NdbApiWrapper::NdbTransaction__deleteTuple >(env, NULL, obj, p0, p1, p2, p3, p4, p5, p6); #endif // NDBJTIE_USE_WRAPPED_VARIANT_FOR_FUNCTION } /* * Class: com_mysql_ndbjtie_ndbapi_NdbTransaction * Method: scanTable - * Signature: (Lcom/mysql/ndbjtie/ndbapi/NdbRecordConst;I[BLcom/mysql/ndbjtie/ndbapi/NdbScanOperation/ScanOptionsConstArray;I)Lcom/mysql/ndbjtie/ndbapi/NdbScanOperation; + * Signature: (Lcom/mysql/ndbjtie/ndbapi/NdbRecordConst;I[BLcom/mysql/ndbjtie/ndbapi/NdbScanOperation/ScanOptionsConst;I)Lcom/mysql/ndbjtie/ndbapi/NdbScanOperation; */ JNIEXPORT jobject JNICALL -Java_com_mysql_ndbjtie_ndbapi_NdbTransaction_scanTable(JNIEnv * env, jobject obj, jobject p0, jint p1, jbyteArray p2, jobjectArray p3, jint p4) +Java_com_mysql_ndbjtie_ndbapi_NdbTransaction_scanTable(JNIEnv * env, jobject obj, jobject p0, jint p1, jbyteArray p2, jobject p3, jint p4) { - TRACE("jobject Java_com_mysql_ndbjtie_ndbapi_NdbTransaction_scanTable(JNIEnv *, jobject, jobject, jint, jbyteArray, jobjectArray, jint)"); + TRACE("jobject Java_com_mysql_ndbjtie_ndbapi_NdbTransaction_scanTable(JNIEnv *, jobject, jobject, jint, jbyteArray, jobject, jint)"); #ifndef NDBJTIE_USE_WRAPPED_VARIANT_FOR_FUNCTION - return gcall_mfr< ttrait_c_m_n_n_NdbTransaction_t, ttrait_c_m_n_n_NdbScanOperation_p, ttrait_c_m_n_n_NdbRecord_cp, ttrait_c_m_n_n_NdbOperation_LockMode_iv/*_enum_*/, ttrait_Uint8_0cp_a, ttrait_c_m_n_n_NdbScanOperation_ScanOptionsArray_cp/*_const NdbScanOperation.ScanOptions *_*/, ttrait_Uint32, &NdbTransaction::scanTable >(env, obj, p0, p1, p2, p3, p4); + return gcall_mfr< ttrait_c_m_n_n_NdbTransaction_t, ttrait_c_m_n_n_NdbScanOperation_p, ttrait_c_m_n_n_NdbRecord_cp, ttrait_c_m_n_n_NdbOperation_LockMode_iv/*_enum_*/, ttrait_Uint8_0cp_a, ttrait_c_m_n_n_NdbScanOperation_ScanOptions_cp, ttrait_Uint32, &NdbTransaction::scanTable >(env, obj, p0, p1, p2, p3, p4); #else - return gcall_fr< ttrait_c_m_n_n_NdbScanOperation_p, ttrait_c_m_n_n_NdbTransaction_r, ttrait_c_m_n_n_NdbRecord_cp, ttrait_c_m_n_n_NdbOperation_LockMode_iv/*_enum_*/, ttrait_Uint8_0cp_a, ttrait_c_m_n_n_NdbScanOperation_ScanOptionsArray_cp/*_const NdbScanOperation.ScanOptions *_*/, ttrait_Uint32, &NdbApiWrapper::NdbTransaction__scanTable >(env, NULL, obj, p0, p1, p2, p3, p4); + return gcall_fr< ttrait_c_m_n_n_NdbScanOperation_p, ttrait_c_m_n_n_NdbTransaction_r, ttrait_c_m_n_n_NdbRecord_cp, ttrait_c_m_n_n_NdbOperation_LockMode_iv/*_enum_*/, ttrait_Uint8_0cp_a, ttrait_c_m_n_n_NdbScanOperation_ScanOptions_cp, ttrait_Uint32, &NdbApiWrapper::NdbTransaction__scanTable >(env, NULL, obj, p0, p1, p2, p3, p4); #endif // NDBJTIE_USE_WRAPPED_VARIANT_FOR_FUNCTION } /* * Class: com_mysql_ndbjtie_ndbapi_NdbTransaction * Method: scanIndex - * Signature: (Lcom/mysql/ndbjtie/ndbapi/NdbRecordConst;Lcom/mysql/ndbjtie/ndbapi/NdbRecordConst;I[BLcom/mysql/ndbjtie/ndbapi/NdbIndexScanOperation/IndexBoundConst;Lcom/mysql/ndbjtie/ndbapi/NdbScanOperation/ScanOptionsConstArray;I)Lcom/mysql/ndbjtie/ndbapi/NdbIndexScanOperation; + * Signature: (Lcom/mysql/ndbjtie/ndbapi/NdbRecordConst;Lcom/mysql/ndbjtie/ndbapi/NdbRecordConst;I[BLcom/mysql/ndbjtie/ndbapi/NdbIndexScanOperation/IndexBoundConst;Lcom/mysql/ndbjtie/ndbapi/NdbScanOperation/ScanOptionsConst;I)Lcom/mysql/ndbjtie/ndbapi/NdbIndexScanOperation; */ JNIEXPORT jobject JNICALL -Java_com_mysql_ndbjtie_ndbapi_NdbTransaction_scanIndex(JNIEnv * env, jobject obj, jobject p0, jobject p1, jint p2, jbyteArray p3, jobject p4, jobjectArray p5, jint p6) +Java_com_mysql_ndbjtie_ndbapi_NdbTransaction_scanIndex(JNIEnv * env, jobject obj, jobject p0, jobject p1, jint p2, jbyteArray p3, jobject p4, jobject p5, jint p6) { - TRACE("jobject Java_com_mysql_ndbjtie_ndbapi_NdbTransaction_scanIndex(JNIEnv *, jobject, jobject, jobject, jint, jbyteArray, jobject, jobjectArray, jint)"); + TRACE("jobject Java_com_mysql_ndbjtie_ndbapi_NdbTransaction_scanIndex(JNIEnv *, jobject, jobject, jobject, jint, jbyteArray, jobject, jobject, jint)"); #ifndef NDBJTIE_USE_WRAPPED_VARIANT_FOR_FUNCTION - return gcall_mfr< ttrait_c_m_n_n_NdbTransaction_t, ttrait_c_m_n_n_NdbIndexScanOperation_p, ttrait_c_m_n_n_NdbRecord_cp, ttrait_c_m_n_n_NdbRecord_cp, ttrait_c_m_n_n_NdbOperation_LockMode_iv/*_enum_*/, ttrait_Uint8_0cp_a, ttrait_c_m_n_n_NdbIndexScanOperation_IndexBound_cp, ttrait_c_m_n_n_NdbScanOperation_ScanOptionsArray_cp/*_const NdbScanOperation.ScanOptions *_*/, ttrait_Uint32, &NdbTransaction::scanIndex >(env, obj, p0, p1, p2, p3, p4, p5, p6); + return gcall_mfr< ttrait_c_m_n_n_NdbTransaction_t, ttrait_c_m_n_n_NdbIndexScanOperation_p, ttrait_c_m_n_n_NdbRecord_cp, ttrait_c_m_n_n_NdbRecord_cp, ttrait_c_m_n_n_NdbOperation_LockMode_iv/*_enum_*/, ttrait_Uint8_0cp_a, ttrait_c_m_n_n_NdbIndexScanOperation_IndexBound_cp, ttrait_c_m_n_n_NdbScanOperation_ScanOptions_cp, ttrait_Uint32, &NdbTransaction::scanIndex >(env, obj, p0, p1, p2, p3, p4, p5, p6); #else - return gcall_fr< ttrait_c_m_n_n_NdbIndexScanOperation_p, ttrait_c_m_n_n_NdbTransaction_r, ttrait_c_m_n_n_NdbRecord_cp, ttrait_c_m_n_n_NdbRecord_cp, ttrait_c_m_n_n_NdbOperation_LockMode_iv/*_enum_*/, ttrait_Uint8_0cp_a, ttrait_c_m_n_n_NdbIndexScanOperation_IndexBound_cp, ttrait_c_m_n_n_NdbScanOperation_ScanOptionsArray_cp/*_const NdbScanOperation.ScanOptions *_*/, ttrait_Uint32, &NdbApiWrapper::NdbTransaction__scanIndex >(env, NULL, obj, p0, p1, p2, p3, p4, p5, p6); + return gcall_fr< ttrait_c_m_n_n_NdbIndexScanOperation_p, ttrait_c_m_n_n_NdbTransaction_r, ttrait_c_m_n_n_NdbRecord_cp, ttrait_c_m_n_n_NdbRecord_cp, ttrait_c_m_n_n_NdbOperation_LockMode_iv/*_enum_*/, ttrait_Uint8_0cp_a, ttrait_c_m_n_n_NdbIndexScanOperation_IndexBound_cp, ttrait_c_m_n_n_NdbScanOperation_ScanOptions_cp, ttrait_Uint32, &NdbApiWrapper::NdbTransaction__scanIndex >(env, NULL, obj, p0, p1, p2, p3, p4, p5, p6); #endif // NDBJTIE_USE_WRAPPED_VARIANT_FOR_FUNCTION } === modified file 'storage/ndb/src/ndbjtie/ndbjtie_lib.cpp' --- a/storage/ndb/src/ndbjtie/ndbjtie_lib.cpp 2010-04-06 09:19:08 +0000 +++ b/storage/ndb/src/ndbjtie/ndbjtie_lib.cpp 2010-10-02 06:07:43 +0000 @@ -110,8 +110,6 @@ JTIE_INSTANTIATE_PEER_CLASS_MAPPING(c_m_ "com/mysql/ndbjtie/ndbapi/NdbOperation$GetValueSpecArray") JTIE_INSTANTIATE_PEER_CLASS_MAPPING(c_m_n_n_NdbOperation_OperationOptions, "com/mysql/ndbjtie/ndbapi/NdbOperation$OperationOptions") -JTIE_INSTANTIATE_PEER_CLASS_MAPPING(c_m_n_n_NdbOperation_OperationOptionsArray, - "com/mysql/ndbjtie/ndbapi/NdbOperation$OperationOptionsArray") JTIE_INSTANTIATE_PEER_CLASS_MAPPING(c_m_n_n_NdbOperation_SetValueSpec, "com/mysql/ndbjtie/ndbapi/NdbOperation$SetValueSpec") JTIE_INSTANTIATE_PEER_CLASS_MAPPING(c_m_n_n_NdbOperation_SetValueSpecArray, @@ -126,8 +124,6 @@ JTIE_INSTANTIATE_PEER_CLASS_MAPPING(c_m_ "com/mysql/ndbjtie/ndbapi/NdbScanOperation") JTIE_INSTANTIATE_PEER_CLASS_MAPPING(c_m_n_n_NdbScanOperation_ScanOptions, "com/mysql/ndbjtie/ndbapi/NdbScanOperation$ScanOptions") -JTIE_INSTANTIATE_PEER_CLASS_MAPPING(c_m_n_n_NdbScanOperation_ScanOptionsArray, - "com/mysql/ndbjtie/ndbapi/NdbScanOperation$ScanOptionsArray") JTIE_INSTANTIATE_PEER_CLASS_MAPPING(c_m_n_n_NdbTransaction, "com/mysql/ndbjtie/ndbapi/NdbTransaction") JTIE_INSTANTIATE_PEER_CLASS_MAPPING(c_m_n_n_Ndb_Key_part_ptr, --===============0173504640== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/martin.zaun@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: martin.zaun@stripped # target_branch: file:///Users/mz/mysql/ndb-7.1-ndbjtie-fixes/ # testament_sha1: bf044e5d4b9812a2a8d3f67ab3c0eed83c3e796b # timestamp: 2010-10-01 23:07:50 -0700 # base_revision_id: jonas@stripped # # Begin bundle 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 --===============0173504640==--