bzr push into mysql-5.5-cluster-7.2 branch (martin.zaun:3898 to 3899)

[Martin Zaun]

 3899 Martin Zaun	2012-04-24 [merge]
      merge from 71 to 72

    modified:
      storage/ndb/src/ndbjtie/test/ndbjtie_unit_tests_consts.cpp
      storage/ndb/src/ndbjtie/test/ndbjtie_unit_tests_consts.hpp
      storage/ndb/src/ndbjtie/test/ndbjtie_unit_tests_lib.cpp
 3898 Frazer Clement	2012-04-24 [merge]
      Merge 7.1->7.2

    modified:
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
      storage/ndb/src/kernel/vm/ArrayPool.hpp
=== modified file 'storage/ndb/src/ndbjtie/test/ndbjtie_unit_tests_consts.cpp'
--- a/storage/ndb/src/ndbjtie/test/ndbjtie_unit_tests_consts.cpp	2012-04-19 10:46:43 +0000
+++ b/storage/ndb/src/ndbjtie/test/ndbjtie_unit_tests_consts.cpp	2012-04-24 18:11:46 +0000
@@ -28,7 +28,7 @@
 // name/value pair
 struct Constant {
     const char * const name;
-    const long long value;
+    const int64_t value;
 };
 
 // the list of defined constants
@@ -432,7 +432,7 @@ static Constant constants[] = {
     { "", UNKNOWN_CONSTANT } // last entry
 };
 
-long long nativeConstValue(const char * p0) {
+int64_t nativeConstValue(const char * p0) {
     assert(p0);
     const int n = sizeof(constants) / sizeof(constants[0]);
     for (int i = 0; i < n; i++) {

=== modified file 'storage/ndb/src/ndbjtie/test/ndbjtie_unit_tests_consts.hpp'
--- a/storage/ndb/src/ndbjtie/test/ndbjtie_unit_tests_consts.hpp	2012-04-19 10:46:43 +0000
+++ b/storage/ndb/src/ndbjtie/test/ndbjtie_unit_tests_consts.hpp	2012-04-24 18:11:46 +0000
@@ -18,14 +18,16 @@
  * ndbjtie_unit_tests_consts.hpp
  */
 
+#include "jtie_stdint.h"
+
 #ifndef ndbjtie_unit_tests_consts_hpp
 #define ndbjtie_unit_tests_consts_hpp
 
 // magic value if a constant name is unknown
-const long long UNKNOWN_CONSTANT = 0x0abcdef00fedcba0;
+const int64_t UNKNOWN_CONSTANT = 0x0abcdef00fedcba0LL;
 
 // Returns the integral value of a constant passed by its qualified JVM name,
 // or UNKNOWN_CONSTANT if the passed name is unknown to this function.
-extern long long nativeConstValue(const char * p0);
+extern int64_t nativeConstValue(const char * p0);
 
 #endif // ndbjtie_unit_tests_consts_hpp

=== modified file 'storage/ndb/src/ndbjtie/test/ndbjtie_unit_tests_lib.cpp'
--- a/storage/ndb/src/ndbjtie/test/ndbjtie_unit_tests_lib.cpp	2012-04-19 10:46:43 +0000
+++ b/storage/ndb/src/ndbjtie/test/ndbjtie_unit_tests_lib.cpp	2012-04-24 18:11:46 +0000
@@ -55,7 +55,7 @@ JNIEXPORT jlong JNICALL
 Java_test_NdbJTieConstantsTest_nativeConstValue(JNIEnv * env, jclass cls, jstring p0)
 {
     TRACE("jlong Java_test_NdbJTieConstantsTest_nativeConstValue(JNIEnv *, jclass, jstring)");
-    return gcall_fr< ttrait_longlong, ttrait_char_cp_jutf8null, &::nativeConstValue >(env, cls, p0);
+    return gcall_fr< ttrait_int64, ttrait_char_cp_jutf8null, &::nativeConstValue >(env, cls, p0);
 }
     
 } // extern "C"

No bundle (reason: useless for push emails).