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
3421 Jorgen Austvik 2010-02-16 [merge]
merge .bzrignore changes from 7.0
modified:
.bzrignore
=== 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
Attachment: [text/bzr-bundle] bzr/martin.zaun@sun.com-20100216112121-96hfw9xpxrrsof9g.bundle
| Thread |
|---|
| • bzr push into mysql-5.1-telco-7.1 branch (martin.zaun:3421 to 3422) | Martin Zaun | 16 Feb |
