From: Martin Zaun Date: February 16 2010 11:21am Subject: bzr commit into mysql-5.1-telco-7.1 branch (martin.zaun:3422) List-Archive: http://lists.mysql.com/commits/100504 Message-Id: <20100216112137.EB6EAC2C168@mzs-macbook-pro.local> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="Boundary_(ID_l8FJqzWw75nSCB8RgwLdOA)" --Boundary_(ID_l8FJqzWw75nSCB8RgwLdOA) 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/ based on revid:jorgen.austvik@stripped 3422 Martin Zaun 2010-02-16 [merge] ndbjtie merge from ndb-7.1-wrapper to ndb-7.1 modified: storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbDictionary.java storage/ndb/src/ndbjtie/ndbapi_jtie.hpp === modified file 'storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbDictionary.java' --- a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbDictionary.java 2010-02-13 08:01:08 +0000 +++ b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbDictionary.java 2010-02-16 06:20:08 +0000 @@ -245,8 +245,6 @@ public class NdbDictionary extends Wrapp int/*_Uint32_*/ getFragmentDataLen() /*_const_*/; ByteBuffer/*_const void *_*/ getRangeListData() /*_const_*/; int/*_Uint32_*/ getRangeListDataLen() /*_const_*/; - ByteBuffer/*_const void *_*/ getTablespaceData() /*_const_*/; - int/*_Uint32_*/ getTablespaceDataLen() /*_const_*/; NdbRecordConst/*_const NdbRecord *_*/ getDefaultRecord() /*_const_*/; boolean getLinearFlag() /*_const_*/; int/*_Uint32_*/ getFragmentCount() /*_const_*/; @@ -258,7 +256,6 @@ public class NdbDictionary extends Wrapp /*_virtual_*/ int getObjectVersion() /*_const_*/; int/*_Uint32_*/ getDefaultNoPartitionsFlag() /*_const_*/; /*_virtual_*/ int getObjectId() /*_const_*/; - int/*_Uint32_*/ getTablespaceNamesLen() /*_const_*/; long/*_Uint64_*/ getMaxRows() /*_const_*/; long/*_Uint64_*/ getMinRows() /*_const_*/; int/*_SingleUserMode_*/ getSingleUserMode() /*_const_*/; @@ -287,8 +284,6 @@ public class NdbDictionary extends Wrapp public final native int/*_Uint32_*/ getFragmentDataLen() /*_const_*/; public final native ByteBuffer/*_const void *_*/ getRangeListData() /*_const_*/; public final native int/*_Uint32_*/ getRangeListDataLen() /*_const_*/; - public final native ByteBuffer/*_const void *_*/ getTablespaceData() /*_const_*/; - public final native int/*_Uint32_*/ getTablespaceDataLen() /*_const_*/; public final native NdbRecordConst/*_const NdbRecord *_*/ getDefaultRecord() /*_const_*/; public final native boolean getLinearFlag() /*_const_*/; public final native int/*_Uint32_*/ getFragmentCount() /*_const_*/; @@ -300,7 +295,6 @@ public class NdbDictionary extends Wrapp public /*_virtual_*/ native int getObjectVersion() /*_const_*/; public final native int/*_Uint32_*/ getDefaultNoPartitionsFlag() /*_const_*/; public /*_virtual_*/ native int getObjectId() /*_const_*/; - public final native int/*_Uint32_*/ getTablespaceNamesLen() /*_const_*/; public final native long/*_Uint64_*/ getMaxRows() /*_const_*/; public final native long/*_Uint64_*/ getMinRows() /*_const_*/; public final native int/*_SingleUserMode_*/ getSingleUserMode() /*_const_*/; @@ -327,9 +321,6 @@ public class NdbDictionary extends Wrapp public final native void setDefaultNoPartitionsFlag(int/*_Uint32_*/ indicator); public final native int setFrm(ByteBuffer/*_const void *_*/ data, int/*_Uint32_*/ len); public final native int setFragmentData(ByteBuffer/*_const void *_*/ data, int/*_Uint32_*/ len); - public final native int setTablespaceNames(ByteBuffer/*_const void *_*/ data, int/*_Uint32_*/ len); - public final native ByteBuffer/*_const void *_*/ getTablespaceNames(); - public final native int setTablespaceData(ByteBuffer/*_const void *_*/ data, int/*_Uint32_*/ len); public final native int setRangeListData(ByteBuffer/*_const void *_*/ data, int/*_Uint32_*/ len); // MMM declared but not implemented in NDBAPI: public final native void setObjectType(int/*_Object.Type_*/ type); public final native void setMaxRows(long/*_Uint64_*/ maxRows); @@ -722,8 +713,8 @@ public class NdbDictionary extends Wrapp public final native boolean supportedAlterTable(TableConst/*_const Table &_*/ f, TableConst/*_const Table &_*/ t); public final native void removeCachedTable(String/*_const char *_*/ table); public final native void removeCachedIndex(String/*_const char *_*/ index, String/*_const char *_*/ table); - public final native int createIndex(IndexConst/*_const Index &_*/ index); - public final native int createIndex(IndexConst/*_const Index &_*/ index, TableConst/*_const Table &_*/ table); + public final native int createIndex(IndexConst/*_const Index &_*/ index, boolean offline /*_= false_*/); + public final native int createIndex(IndexConst/*_const Index &_*/ index, TableConst/*_const Table &_*/ table, boolean offline /*_= false_*/); public final native int dropIndex(String/*_const char *_*/ indexName, String/*_const char *_*/ tableName); public final native int createLogfileGroup(LogfileGroupConst/*_const LogfileGroup &_*/ p0, ObjectId/*_ObjectId *_*/ p1 /*_= 0_*/); public final native int dropLogfileGroup(LogfileGroupConst/*_const LogfileGroup &_*/ p0); === modified file 'storage/ndb/src/ndbjtie/ndbapi_jtie.hpp' --- a/storage/ndb/src/ndbjtie/ndbapi_jtie.hpp 2010-02-13 08:01:08 +0000 +++ b/storage/ndb/src/ndbjtie/ndbapi_jtie.hpp 2010-02-16 06:20:08 +0000 @@ -331,7 +331,7 @@ Java_com_mysql_ndbjtie_ndbapi_Ndb_getNdb * Signature: (Lcom/mysql/ndbjtie/ndbapi/NdbErrorConst;Ljava/nio/ByteBuffer;I)Ljava/lang/String; */ JNIEXPORT jstring JNICALL -Java_com_mysql_ndbjtie_ndbapi_Ndb_getNdbErrorDetail(JNIEnv * env, jobject obj, jobject p0, jobject p1, jint p2) +Java_com_mysql_ndbjtie_ndbapi_Ndb_getNdbErrorDetail(JNIEnv * env, jobject obj, jobject p0, jobject p1, jint p2) { TRACE("Java_com_mysql_ndbjtie_ndbapi_Ndb_getNdbErrorDetail(JNIEnv *, jobject, jobject, jobject, jint)"); return gcall_mfr< ttrait_c_m_n_n_Ndb_ct, ttrait_utf8cstring, ttrait_c_m_n_n_NdbError_cr, ttrait_char_0p_bb, ttrait_Uint32, &Ndb::getNdbErrorDetail >(env, obj, p0, p1, p2); @@ -502,9 +502,9 @@ Java_com_mysql_ndbjtie_ndbapi_Ndb_startT * Signature: (Lcom/mysql/ndbjtie/ndbapi/NdbDictionary/TableConst;[Lcom/mysql/ndbjtie/ndbapi/Ndb/Key_part_ptrConst;Ljava/nio/ByteBuffer;I)Lcom/mysql/ndbjtie/ndbapi/NdbTransaction; */ JNIEXPORT jobject JNICALL -Java_com_mysql_ndbjtie_ndbapi_Ndb_startTransaction__Lcom_mysql_ndbjtie_ndbapi_NdbDictionary_TableConst_2_3Lcom_mysql_ndbjtie_ndbapi_Ndb_Key_1part_1ptrConst_2Ljava_nio_ByteBuffer_2I(JNIEnv * env, jobject obj, jobject p0, jobjectArray p1, jobject p2, jint p3) +Java_com_mysql_ndbjtie_ndbapi_Ndb_startTransaction__Lcom_mysql_ndbjtie_ndbapi_NdbDictionary_00024TableConst_2_3Lcom_mysql_ndbjtie_ndbapi_Ndb_Key_1part_1ptrConst_2Ljava_nio_ByteBuffer_2I(JNIEnv * env, jobject obj, jobject p0, jobjectArray p1, jobject p2, jint p3) { - TRACE("jobject Java_com_mysql_ndbjtie_ndbapi_Ndb_startTransaction__Lcom_mysql_ndbjtie_ndbapi_NdbDictionary_TableConst_2_3Lcom_mysql_ndbjtie_ndbapi_Ndb_Key_1part_1ptrConst_2Ljava_nio_ByteBuffer_2I(JNIEnv *, jobject, jobject, jobjectArray, jobject, jint)"); + TRACE("jobject Java_com_mysql_ndbjtie_ndbapi_Ndb_startTransaction__Lcom_mysql_ndbjtie_ndbapi_NdbDictionary_00024TableConst_2_3Lcom_mysql_ndbjtie_ndbapi_Ndb_Key_1part_1ptrConst_2Ljava_nio_ByteBuffer_2I(JNIEnv *, jobject, jobject, jobjectArray, jobject, jint)"); return gcall_mfr< ttrait_c_m_n_n_Ndb_t, ttrait_c_m_n_n_NdbTransaction_p, ttrait_c_m_n_n_NdbDictionary_Table_cp, ttrait_c_m_n_n_Ndb_Key_part_ptr_ca, ttrait_void_1p_bb, ttrait_Uint32, &Ndb::startTransaction >(env, obj, p0, p1, p2, p3); // MMM! not supported yet: array of objects Key_part_ptr[] } #endif // MMM! not supported yet: array of objects Key_part_ptr[] @@ -1219,7 +1219,7 @@ Java_com_mysql_ndbjtie_ndbapi_NdbDiction return gcall_mfr< ttrait_c_m_n_n_NdbDictionary_Column_ct, ttrait_int, &NdbDictionary::Column::getLength >(env, obj); } -/* +/* * Class: com_mysql_ndbjtie_ndbapi_NdbDictionary_Column * Method: getCharsetNumber * Signature: ()I @@ -1961,29 +1961,29 @@ Java_com_mysql_ndbjtie_ndbapi_NdbDiction } #endif // !SKIP_IF_MSVC -/* TODO +/* * Class: com_mysql_ndbjtie_ndbapi_NdbDictionary_Dictionary * Method: createIndex - * Signature: (Lcom/mysql/ndbjtie/ndbapi/NdbDictionary/IndexConst;)I + * Signature: (Lcom/mysql/ndbjtie/ndbapi/NdbDictionary/IndexConst;Z)I + */ JNIEXPORT jint JNICALL -Java_com_mysql_ndbjtie_ndbapi_NdbDictionary_00024Dictionary_createIndex__Lcom_mysql_ndbjtie_ndbapi_NdbDictionary_IndexConst_2(JNIEnv * env, jobject obj, jobject p0) +Java_com_mysql_ndbjtie_ndbapi_NdbDictionary_00024Dictionary_createIndex__Lcom_mysql_ndbjtie_ndbapi_NdbDictionary_IndexConst_2Z(JNIEnv * env, jobject obj, jobject p0, jboolean p1) { - TRACE("jint Java_com_mysql_ndbjtie_ndbapi_NdbDictionary_00024Dictionary_createIndex__Lcom_mysql_ndbjtie_ndbapi_NdbDictionary_IndexConst_2(JNIEnv *, jobject, jobject)"); - return gcall_mfr< ttrait_c_m_n_n_NdbDictionary_Dictionary_t, ttrait_int, ttrait_c_m_n_n_NdbDictionary_Index_cr, &NdbDictionary::Dictionary::createIndex >(env, obj, p0); + TRACE("jint Java_com_mysql_ndbjtie_ndbapi_NdbDictionary_00024Dictionary_createIndex__Lcom_mysql_ndbjtie_ndbapi_NdbDictionary_IndexConst_2Z(JNIEnv *, jobject, jobject, jboolean)"); + return gcall_mfr< ttrait_c_m_n_n_NdbDictionary_Dictionary_t, ttrait_int, ttrait_c_m_n_n_NdbDictionary_Index_cr, ttrait_bool, &NdbDictionary::Dictionary::createIndex >(env, obj, p0, p1); } -*/ -/* TODO +/* * Class: com_mysql_ndbjtie_ndbapi_NdbDictionary_Dictionary * Method: createIndex - * Signature: (Lcom/mysql/ndbjtie/ndbapi/NdbDictionary/IndexConst;Lcom/mysql/ndbjtie/ndbapi/NdbDictionary/TableConst;)I + * Signature: (Lcom/mysql/ndbjtie/ndbapi/NdbDictionary/IndexConst;Lcom/mysql/ndbjtie/ndbapi/NdbDictionary/TableConst;Z)I + */ JNIEXPORT jint JNICALL -Java_com_mysql_ndbjtie_ndbapi_NdbDictionary_00024Dictionary_createIndex__Lcom_mysql_ndbjtie_ndbapi_NdbDictionary_IndexConst_2Lcom_mysql_ndbjtie_ndbapi_NdbDictionary_00024TableConst_2(JNIEnv * env, jobject obj, jobject p0, jobject p1) +Java_com_mysql_ndbjtie_ndbapi_NdbDictionary_00024Dictionary_createIndex__Lcom_mysql_ndbjtie_ndbapi_NdbDictionary_IndexConst_2Lcom_mysql_ndbjtie_ndbapi_NdbDictionary_00024TableConst_2Z(JNIEnv * env, jobject obj, jobject p0, jobject p1, jboolean p2) { - TRACE("jint Java_com_mysql_ndbjtie_ndbapi_NdbDictionary_00024Dictionary_createIndex__Lcom_mysql_ndbjtie_ndbapi_NdbDictionary_IndexConst_2Lcom_mysql_ndbjtie_ndbapi_NdbDictionary_00024TableConst_2(JNIEnv *, jobject, jobject, jobject)"); - return gcall_mfr< ttrait_c_m_n_n_NdbDictionary_Dictionary_t, ttrait_int, ttrait_c_m_n_n_NdbDictionary_Index_cr, ttrait_c_m_n_n_NdbDictionary_Table_cr, &NdbDictionary::Dictionary::createIndex >(env, obj, p0, p1); + TRACE("jint Java_com_mysql_ndbjtie_ndbapi_NdbDictionary_00024Dictionary_createIndex__Lcom_mysql_ndbjtie_ndbapi_NdbDictionary_IndexConst_2Lcom_mysql_ndbjtie_ndbapi_NdbDictionary_00024TableConst_2Z(JNIEnv *, jobject, jobject, jobject, jboolean)"); + return gcall_mfr< ttrait_c_m_n_n_NdbDictionary_Dictionary_t, ttrait_int, ttrait_c_m_n_n_NdbDictionary_Index_cr, ttrait_c_m_n_n_NdbDictionary_Table_cr, ttrait_bool, &NdbDictionary::Dictionary::createIndex >(env, obj, p0, p1, p2); } -*/ /* * Class: com_mysql_ndbjtie_ndbapi_NdbDictionary_Dictionary @@ -3623,17 +3623,17 @@ Java_com_mysql_ndbjtie_ndbapi_NdbDiction return gcall_mfr< ttrait_c_m_n_n_NdbDictionary_Table_ct, ttrait_Uint32, &NdbDictionary::Table::getFrmLength >(env, obj); } -/* TODO +/* * Class: com_mysql_ndbjtie_ndbapi_NdbDictionary_Table * Method: getFragmentData * Signature: ()Ljava/nio/ByteBuffer; + */ JNIEXPORT jobject JNICALL Java_com_mysql_ndbjtie_ndbapi_NdbDictionary_00024Table_getFragmentData(JNIEnv * env, jobject obj) { TRACE("jobject Java_com_mysql_ndbjtie_ndbapi_NdbDictionary_00024Table_getFragmentData(JNIEnv *, jobject)"); - return gcall_mfr< ttrait_c_m_n_n_NdbDictionary_Table_ct, ttrait_void_1cp_bb, &NdbDictionary::Table::getFragmentData >(env, obj); + return gcall_mfr< ttrait_c_m_n_n_NdbDictionary_Table_ct, ttrait_Uint32_0cp_bb, &NdbDictionary::Table::getFragmentData >(env, obj); } - */ /* * Class: com_mysql_ndbjtie_ndbapi_NdbDictionary_Table @@ -3647,17 +3647,17 @@ Java_com_mysql_ndbjtie_ndbapi_NdbDiction return gcall_mfr< ttrait_c_m_n_n_NdbDictionary_Table_ct, ttrait_Uint32, &NdbDictionary::Table::getFragmentDataLen >(env, obj); } -/* TODO +/* * Class: com_mysql_ndbjtie_ndbapi_NdbDictionary_Table * Method: getRangeListData * Signature: ()Ljava/nio/ByteBuffer; + */ JNIEXPORT jobject JNICALL Java_com_mysql_ndbjtie_ndbapi_NdbDictionary_00024Table_getRangeListData(JNIEnv * env, jobject obj) { TRACE("jobject Java_com_mysql_ndbjtie_ndbapi_NdbDictionary_00024Table_getRangeListData(JNIEnv *, jobject)"); - return gcall_mfr< ttrait_c_m_n_n_NdbDictionary_Table_ct, ttrait_void_1cp_bb, &NdbDictionary::Table::getRangeListData >(env, obj); + return gcall_mfr< ttrait_c_m_n_n_NdbDictionary_Table_ct, ttrait_Int32_0cp_bb, &NdbDictionary::Table::getRangeListData >(env, obj); } - */ /* * Class: com_mysql_ndbjtie_ndbapi_NdbDictionary_Table @@ -3671,30 +3671,6 @@ Java_com_mysql_ndbjtie_ndbapi_NdbDiction return gcall_mfr< ttrait_c_m_n_n_NdbDictionary_Table_ct, ttrait_Uint32, &NdbDictionary::Table::getRangeListDataLen >(env, obj); } -/* TODO - * Class: com_mysql_ndbjtie_ndbapi_NdbDictionary_Table - * Method: getTablespaceData - * Signature: ()Ljava/nio/ByteBuffer; -JNIEXPORT jobject JNICALL -Java_com_mysql_ndbjtie_ndbapi_NdbDictionary_00024Table_getTablespaceData(JNIEnv * env, jobject obj) -{ - TRACE("jobject Java_com_mysql_ndbjtie_ndbapi_NdbDictionary_00024Table_getTablespaceData(JNIEnv *, jobject)"); - return gcall_mfr< ttrait_c_m_n_n_NdbDictionary_Table_ct, ttrait_void_1cp_bb, &NdbDictionary::Table::getTablespaceData >(env, obj); -} - */ - -/* TODO - * Class: com_mysql_ndbjtie_ndbapi_NdbDictionary_Table - * Method: getTablespaceDataLen - * Signature: ()I -JNIEXPORT jint JNICALL -Java_com_mysql_ndbjtie_ndbapi_NdbDictionary_00024Table_getTablespaceDataLen(JNIEnv * env, jobject obj) -{ - TRACE("jint Java_com_mysql_ndbjtie_ndbapi_NdbDictionary_00024Table_getTablespaceDataLen(JNIEnv *, jobject)"); - return gcall_mfr< ttrait_c_m_n_n_NdbDictionary_Table_ct, ttrait_Uint32, &NdbDictionary::Table::getTablespaceDataLen >(env, obj); -} - */ - /* * Class: com_mysql_ndbjtie_ndbapi_NdbDictionary_Table * Method: getDefaultRecord @@ -3815,18 +3791,6 @@ Java_com_mysql_ndbjtie_ndbapi_NdbDiction return gcall_mfr< ttrait_c_m_n_n_NdbDictionary_Table_ct, ttrait_int, &NdbDictionary::Table::getObjectId >(env, obj); } -/* TODO - * Class: com_mysql_ndbjtie_ndbapi_NdbDictionary_Table - * Method: getTablespaceNamesLen - * Signature: ()I -JNIEXPORT jint JNICALL -Java_com_mysql_ndbjtie_ndbapi_NdbDictionary_00024Table_getTablespaceNamesLen(JNIEnv * env, jobject obj) -{ - TRACE("jint Java_com_mysql_ndbjtie_ndbapi_NdbDictionary_00024Table_getTablespaceNamesLen(JNIEnv *, jobject)"); - return gcall_mfr< ttrait_c_m_n_n_NdbDictionary_Table_ct, ttrait_Uint32, &NdbDictionary::Table::getTablespaceNamesLen >(env, obj); -} - */ - /* * Class: com_mysql_ndbjtie_ndbapi_NdbDictionary_Table * Method: getMaxRows @@ -4119,65 +4083,29 @@ Java_com_mysql_ndbjtie_ndbapi_NdbDiction return gcall_mfr< ttrait_c_m_n_n_NdbDictionary_Table_t, ttrait_int, ttrait_void_1cp_bb, ttrait_Uint32, &NdbDictionary::Table::setFrm >(env, obj, p0, p1); } -/* TODO +/* * Class: com_mysql_ndbjtie_ndbapi_NdbDictionary_Table * Method: setFragmentData * Signature: (Ljava/nio/ByteBuffer;I)I + */ JNIEXPORT jint JNICALL Java_com_mysql_ndbjtie_ndbapi_NdbDictionary_00024Table_setFragmentData(JNIEnv * env, jobject obj, jobject p0, jint p1) { TRACE("jint Java_com_mysql_ndbjtie_ndbapi_NdbDictionary_00024Table_setFragmentData(JNIEnv *, jobject, jobject, jint)"); - return gcall_mfr< ttrait_c_m_n_n_NdbDictionary_Table_t, ttrait_int, ttrait_void_1cp_bb, ttrait_Uint32, &NdbDictionary::Table::setFragmentData >(env, obj, p0, p1); + return gcall_mfr< ttrait_c_m_n_n_NdbDictionary_Table_t, ttrait_int, ttrait_Uint32_0cp_bb, ttrait_Uint32, &NdbDictionary::Table::setFragmentData >(env, obj, p0, p1); } - */ -/* TODO - * Class: com_mysql_ndbjtie_ndbapi_NdbDictionary_Table - * Method: setTablespaceNames - * Signature: (Ljava/nio/ByteBuffer;I)I -JNIEXPORT jint JNICALL -Java_com_mysql_ndbjtie_ndbapi_NdbDictionary_00024Table_setTablespaceNames(JNIEnv * env, jobject obj, jobject p0, jint p1) -{ - TRACE("jint Java_com_mysql_ndbjtie_ndbapi_NdbDictionary_00024Table_setTablespaceNames(JNIEnv *, jobject, jobject, jint)"); - return gcall_mfr< ttrait_c_m_n_n_NdbDictionary_Table_t, ttrait_int, ttrait_void_1cp_bb, ttrait_Uint32, &NdbDictionary::Table::setTablespaceNames >(env, obj, p0, p1); -} - */ - -/* TODO - * Class: com_mysql_ndbjtie_ndbapi_NdbDictionary_Table - * Method: getTablespaceNames - * Signature: ()Ljava/nio/ByteBuffer; -JNIEXPORT jobject JNICALL -Java_com_mysql_ndbjtie_ndbapi_NdbDictionary_00024Table_getTablespaceNames(JNIEnv * env, jobject obj) -{ - TRACE("jobject Java_com_mysql_ndbjtie_ndbapi_NdbDictionary_00024Table_getTablespaceNames(JNIEnv *, jobject)"); - return gcall_mfr< ttrait_c_m_n_n_NdbDictionary_Table_t, ttrait_void_1cp_bb, &NdbDictionary::Table::getTablespaceNames >(env, obj); -} - */ - -/* TODO - * Class: com_mysql_ndbjtie_ndbapi_NdbDictionary_Table - * Method: setTablespaceData - * Signature: (Ljava/nio/ByteBuffer;I)I -JNIEXPORT jint JNICALL -Java_com_mysql_ndbjtie_ndbapi_NdbDictionary_00024Table_setTablespaceData(JNIEnv * env, jobject obj, jobject p0, jint p1) -{ - TRACE("jint Java_com_mysql_ndbjtie_ndbapi_NdbDictionary_00024Table_setTablespaceData(JNIEnv *, jobject, jobject, jint)"); - return gcall_mfr< ttrait_c_m_n_n_NdbDictionary_Table_t, ttrait_int, ttrait_void_1cp_bb, ttrait_Uint32, &NdbDictionary::Table::setTablespaceData >(env, obj, p0, p1); -} - */ - -/* TODO +/* * Class: com_mysql_ndbjtie_ndbapi_NdbDictionary_Table * Method: setRangeListData * Signature: (Ljava/nio/ByteBuffer;I)I + */ JNIEXPORT jint JNICALL Java_com_mysql_ndbjtie_ndbapi_NdbDictionary_00024Table_setRangeListData(JNIEnv * env, jobject obj, jobject p0, jint p1) { TRACE("jint Java_com_mysql_ndbjtie_ndbapi_NdbDictionary_00024Table_setRangeListData(JNIEnv *, jobject, jobject, jint)"); - return gcall_mfr< ttrait_c_m_n_n_NdbDictionary_Table_t, ttrait_int, ttrait_void_1cp_bb, ttrait_Uint32, &NdbDictionary::Table::setRangeListData >(env, obj, p0, p1); + return gcall_mfr< ttrait_c_m_n_n_NdbDictionary_Table_t, ttrait_int, ttrait_Int32_0cp_bb, ttrait_Uint32, &NdbDictionary::Table::setRangeListData >(env, obj, p0, p1); } - */ /* * Class: com_mysql_ndbjtie_ndbapi_NdbDictionary_Table @@ -4803,51 +4731,54 @@ Java_com_mysql_ndbjtie_ndbapi_NdbEventOp return gcall_mfr< ttrait_c_m_n_n_NdbEventOperation_ct, ttrait_c_m_n_n_NdbDictionary_Event_TableEvent_iv/*_enum_*/, &NdbEventOperation::getEventType >(env, obj); } -/* TODO +/* * Class: com_mysql_ndbjtie_ndbapi_NdbEventOperation * Method: tableNameChanged * Signature: ()Z + */ JNIEXPORT jboolean JNICALL Java_com_mysql_ndbjtie_ndbapi_NdbEventOperation_tableNameChanged(JNIEnv * env, jobject obj) { TRACE("jboolean Java_com_mysql_ndbjtie_ndbapi_NdbEventOperation_tableNameChanged(JNIEnv *, jobject)"); - return gcall_mfr< ttrait_c_m_n_n_NdbEventOperation_ct, ttrait_bool_c, &NdbEventOperation::tableNameChanged >(env, obj); + return gcall_mfr< ttrait_c_m_n_n_NdbEventOperation_ct, ttrait_bool, &NdbEventOperation::tableNameChanged >(env, obj); } -*/ -/* TODO +/* * Class: com_mysql_ndbjtie_ndbapi_NdbEventOperation * Method: tableFrmChanged * Signature: ()Z + */ JNIEXPORT jboolean JNICALL Java_com_mysql_ndbjtie_ndbapi_NdbEventOperation_tableFrmChanged(JNIEnv * env, jobject obj) { TRACE("jboolean Java_com_mysql_ndbjtie_ndbapi_NdbEventOperation_tableFrmChanged(JNIEnv *, jobject)"); - return gcall_mfr< ttrait_c_m_n_n_NdbEventOperation_ct, ttrait_bool_c, &NdbEventOperation::tableFrmChanged >(env, obj); + return gcall_mfr< ttrait_c_m_n_n_NdbEventOperation_ct, ttrait_bool, &NdbEventOperation::tableFrmChanged >(env, obj); } -*/ -/* TODO + +/* * Class: com_mysql_ndbjtie_ndbapi_NdbEventOperation * Method: tableFragmentationChanged * Signature: ()Z + */ JNIEXPORT jboolean JNICALL Java_com_mysql_ndbjtie_ndbapi_NdbEventOperation_tableFragmentationChanged(JNIEnv * env, jobject obj) { TRACE("jboolean Java_com_mysql_ndbjtie_ndbapi_NdbEventOperation_tableFragmentationChanged(JNIEnv *, jobject)"); - return gcall_mfr< ttrait_c_m_n_n_NdbEventOperation_ct, ttrait_bool_c, &NdbEventOperation::tableFragmentationChanged >(env, obj); + return gcall_mfr< ttrait_c_m_n_n_NdbEventOperation_ct, ttrait_bool, &NdbEventOperation::tableFragmentationChanged >(env, obj); } -*/ -/* TODO + +/* * Class: com_mysql_ndbjtie_ndbapi_NdbEventOperation * Method: tableRangeListChanged * Signature: ()Z + */ JNIEXPORT jboolean JNICALL Java_com_mysql_ndbjtie_ndbapi_NdbEventOperation_tableRangeListChanged(JNIEnv * env, jobject obj) { TRACE("jboolean Java_com_mysql_ndbjtie_ndbapi_NdbEventOperation_tableRangeListChanged(JNIEnv *, jobject)"); - return gcall_mfr< ttrait_c_m_n_n_NdbEventOperation_ct, ttrait_bool_c, &NdbEventOperation::tableRangeListChanged >(env, obj); + return gcall_mfr< ttrait_c_m_n_n_NdbEventOperation_ct, ttrait_bool, &NdbEventOperation::tableRangeListChanged >(env, obj); } -*/ + /* * Class: com_mysql_ndbjtie_ndbapi_NdbEventOperation * Method: getGCI @@ -6025,7 +5956,7 @@ Java_com_mysql_ndbjtie_ndbapi_NdbOperati } #if 0 -/* +/* * Class: com_mysql_ndbjtie_ndbapi_NdbOperation * Method: getType * Signature: ()I @@ -6034,8 +5965,7 @@ JNIEXPORT jint JNICALL Java_com_mysql_ndbjtie_ndbapi_NdbOperation_getType(JNIEnv * env, jobject obj) { TRACE("jint Java_com_mysql_ndbjtie_ndbapi_NdbOperation_getType(JNIEnv *, jobject)"); - //MMM const return - return gcall_mfr< ttrait_c_m_n_n_NdbOperation_ct, ttrait_c_m_n_n_NdbOperation_Type_c_iv/*_enum_*/, &NdbOperation::getType >(env, obj); + return gcall_mfr< ttrait_c_m_n_n_NdbOperation_ct, ttrait_c_m_n_n_NdbOperation_Type_c_iv/*_enum_*/, &NdbOperation::getType >(env, obj); // MMM const return } #endif --Boundary_(ID_l8FJqzWw75nSCB8RgwLdOA) MIME-version: 1.0 Content-type: text/bzr-bundle; CHARSET=US-ASCII; name="bzr/martin.zaun@stripped" Content-transfer-encoding: 7BIT Content-disposition: inline; filename="bzr/martin.zaun@stripped" # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: martin.zaun@stripped # target_branch: file:///Users/mz/mysql/ndb-7.1/ # testament_sha1: f7ad167f59f606b0495972b7aad141fb612a1636 # timestamp: 2010-02-16 11:21:37 +0000 # source_branch: file:///Users/mz/mysql/ndb-7.1-wrapper/ # base_revision_id: jorgen.austvik@stripped\ # nf1pw8pnwcqkpil7 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWXWp+54ABnNfgEQQUXf//38/ nhC////yYAu8PXl9e2e2oNHoKHC7UqqbYVVRVESNaHhqao2SA0aGhp6mmRiGjQNABoADQ5gCMExA MAmCaMhoYBMEYmGjRJ6KbSmhkBoAAAAAAAASIhNBMTSZJPQjyieiMCeo2phPU8iD0mgRKRMj1CbU yGQaapvVPCnij1B6j1D1PUDJ6jECpQgSegmpkxkU9NMRhNTE9U2RoCaPUD1ORQA1/9ud8lfQanG3 hMzLmZiIiG4iIiIiIiI5Uinuix7/cfmZ5+j07FMRrztESv4kiWzGPQTBigax9EU3mZCqBsHm838d Ahp2vKJabQHxtKhJySwkCJO6eWFMsZxKFqQFlexlllr2AHKAdCnxPTkPccFx/ywTE5OlPQ0kRkSQ UGPuSA7uDfrMT3F+k260+DOZpXs5zrg6mUN2ebk5EldYV3NUQtFZQsOXY0EFXglhRQ6uomrMQLFs UTWxXpDTCwxapskUSk4L3i870TgoiUZSSB/4m9ML2xVbWo59pcOO0j/fmjy8j9p8/YygcPncwPJp cDmeP+ecv4JGetZc7dZJw3XZqex9e7GLmDDQgICGoMImYZ+1yGf6TDl1gCtgX8wRiABEQDafNJp4 OhAccb9vKWUGnD1MlJfPCa8DBQ6B1LoecoHkk6lH0nW+rR8aqXvjIp6OFxb+vsX3/7IYeXzMczoS CySD4CgWp8RiQE7+D789R4R6w5BUrQ+j64Y6OyRYJC1DQZ84xNo2qKDNuPu9xzqmQKh3Gwet6iin U9hQuMRwQss9+1eaUQ4ZyzyZXQcyOekeZOVyzfdZNDllMqZq1+o71RaokDg9HDHvmHSIXrYl2mAI alr5Z/pW16br6xGWXY6RpS+j7JRqdgyiSwotIsmhLM1y5GhhdCXiMCtqRJUheJeEitCwoYrJEGMl Vtg2NFbmgd/yGS3treRJSxMYoaRiZccqKvr5gUD8i9MXmhLEvLJPHjDNaA+B20DMMaD6mJbp5lYu B7WccuwbmSsaJ4IsxBe7rYzI5PDiPvPVU56ZGg0iO6EraGRsGpY4zQfM7R7VOcI5lvIatFcK7LbJ ozthOLJq4zGo0JRmwMgNDQhCLmlWzG2ditFAGVpIMcZod5RTbGNS9SVBglsIzBnB3mhkfIkewW++ UGgEZ3o77dL0rTpsZZCuJmBTLf1GDCYB1dbFR0tChExLOqZ7UuM1wDALRhDgArFLptaWS+8YjQwx VEVcIaYY0NqFZhRq5W1TAS8ikHQYK9ZNDsEgcip6TqkfucWZxo+M6xGyzdqLA3lmwc/xvsqhbCBP gjiTQ6lTKTXC3Id+XUeASeIyh6V6kj5heJpbfq9W6R4RTbpJuHgczBVEqsMcEitxXGFcixxQMxkj MSpI3OBKjJ+CFRcJIJRdNlFZCkg+Fk1AL8RQpJwQ7hikP3C8ULWkNDUzNBUMB7A2ZRIyJI7ZV8xr xseRc6C+I8xmZEG66nkqT3b6F6s1356404qYWkEREFgpS2VFLM1eFLuO6c5x8uNCrMRWOLSaHU4M 8joZB86Rwue++c8OcTm6xGZbIm9zW3qJ7HYxzXGxkrTcY54XNSka1OJS1Bg0OVk42pZxtTFwNa84 izPjFXPRQ6U2TgUq2KTbpbXAsWTC9ebZMbHyDtk9sjfn4lq1J8FI7m13KMjFXGUU3TiUi1I9ryOR +ay9UuweqRZeVIVEl7Ew+C0NrNNDb+/GTc96j6Mb/1KMbOCUkfK0LfpE5SInQGU/p0ea4kMZU6Dp P9XSWn0bmksULSZ30pRSyz9clk8mMs/dj0PrJfTK/2ORE0UCgSL8PjpxBIEo47Cr+TNYSuscEYSk bDawapwOjrGBRk3qIs/Z+q8XNrSn4jqUKRKRfFbyjqO8smqkk85M5fbLwoXpbWi32khA8qti0V/N TBAuViy6C0Ga6eH6aNKkzZLLH7z+zAfm834vyWewvQ9N9YJAiajXgdW+04bQ2rjjIq8RsuU2LHhg yTF8ZxpVyiUb91zhJko718GcE3xonaGYCqY4OIP4ORA831fBYXHrx6Q8xv3+pfa173N7EQ7ijwUY PCIVkjniPs52Kb201K/GRJ1PY3L9X6NjoYMw2LP6kcbmUOehy9xWDoM86Bf9WgMQ10GnuHvUrgoQ GAJFhUyIJRc0Og48RalBhzFyNA7ASgnipCc7le5olyRks5XQenJPfpyX2b/Jf/N1Sikr422LVtX1 v4VbXqdjkZGt7XibDd6J4KUXYiovlX3uOslpOKCr0UTSNr2O5Io88o5+zGca6bG4XK1SqOr1n5SN uXJXjelWJXj79xaB3bAwLxvKSEn2YCucUzD8S853lOaR0TqdK95qupmydhZudq95JuT0nIyeL/Dv KreY3aabU0PEpTwO0LzhL4YlOXvC1iwOi0qy66LzifN2nip3PQ3q9Y/Yq0sGf3HwnNETrDq7igJq +slTSdu8gociOQVsD5G4webTOQYm+khrWf1Jcs24e9cpNR9j39rFg4nOGdIEQgkQTQIW/g4KvUZr jhxmHirQeV5mplDEKeRR+gaURJ0kha5mAm52ti0P8fFTvNREu8BxNhHAbXhUsQK2EhiKIqUYJR9z iaCeT75FXeza3qTgiTGR3ze9llqBqV5PU/c2JDYQoY00J4N+I3nIFVM5xzU0NJyP/TgmUGrhZzQt I0J+EvSL4L3wiRCwsIrS9WKxWNhoCgKQwNpkK3Li9pNWdqgUpJLCUbED3jcQWGUztCqFSwuNJaXA lwt8mhQpFPZYrQfB3qY+ziS9tknOkexw9pc1kt0ySMYQxnksfgHOTBGmTCao2WT5JnaaRfKDUpHX I9TUWm51OpPS9zE/u0vrI1joE75d3ynzl06NbWIZz5Ef2DOaXiVOgrutYa1I8ppoRfm2Ku0+B4ly m4qajKB1tgO32U5D8Sw1kWxrgzHhaMyXTh24bhs/47uYsbTQUkM6ngqslFIFFJaZlFZX1tx2OzBR NZ3IUaEyTM8XTJGRjmikoirJok4pp96RbXZi561VIbcOEDbYMeAXKKgvtIW5gGBNWOyYUa1KLI0y JcoegxN2kpliY4NjEbWIZjT3COcLQihcvARIgkLMq5R1lVZWMaJsYSSYtZMpgZPpb+W95yM9C9Ip BZK6Ulpckaako3iybX8RhNaGhwvJ8nDNZwTa8pHS4D40Q4f4NBZPDJscSozkUFlBepEeDpcMkcqr 0pzJwbINk6GDNxDB/F3JFOFCQdan7ng= --Boundary_(ID_l8FJqzWw75nSCB8RgwLdOA)--