bzr push into mysql-5.5-cluster-7.2 branch (magnus.blaudd:4020 to 4021)

[magnus.blaudd]

 4021 magnus.blaudd@stripped	2012-10-09
      ndb
       - fix problem linking ndbclient on Windows by replacing the reference
         to JNI_OnLoad(which signature may vary depending on calling convention)
         to a new _ndbjtie_exports function which have constant signature(does
         not depend on defines in jni.h)

    modified:
      storage/ndb/src/ndbclient_exports.cpp
      storage/ndb/src/ndbjtie/ndbjtie_lib.cpp
 4020 Ole John Aske	2012-10-05 [merge]
      Merge 7.1 -> 7.2

    modified:
      storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp
=== modified file 'storage/ndb/src/ndbclient_exports.cpp'
--- a/storage/ndb/src/ndbclient_exports.cpp	2012-09-20 09:45:58 +0000
+++ b/storage/ndb/src/ndbclient_exports.cpp	2012-10-09 17:41:56 +0000
@@ -26,7 +26,9 @@
 #include "ndbapi/NdbInfo.hpp"
 #include "../include/portlib/NdbDir.hpp"
 
-extern "C" void* JNI_OnLoad(void*, void*);
+#ifdef NDB_WITH_NDBJTIE
+extern "C" void _ndbjtie_exports(void);
+#endif
 extern "C" void ndb_usage(void);
 extern "C" void myRandom48Init(void);
 extern "C" void ndb_rand(void);
@@ -48,7 +50,7 @@ _ndbclient_exports(void)
   NdbInfo info(&cluster_connection, "");
   drop_instance(); // NdbPool
 #ifdef NDB_WITH_NDBJTIE
-  JNI_OnLoad(0,0);
+  _ndbjtie_exports();
 #endif
   ndb_usage();
   myRandom48Init();

=== modified file 'storage/ndb/src/ndbjtie/ndbjtie_lib.cpp'
--- a/storage/ndb/src/ndbjtie/ndbjtie_lib.cpp	2011-02-02 09:52:33 +0000
+++ b/storage/ndb/src/ndbjtie/ndbjtie_lib.cpp	2012-10-09 17:41:56 +0000
@@ -230,3 +230,14 @@ JNI_OnUnload(JavaVM * jvm, void * reserv
 }
 
 // ---------------------------------------------------------------------------
+
+/*
+  Dummy function with constant signature to be used by parent library
+  to make sure that the linker includes the functions from this module
+*/
+extern "C"
+void
+_ndbjtie_exports(void)
+{
+  return;
+}

No bundle (reason: useless for push emails).