bzr push into mysql-5.1-telco-7.1 branch (jonas.oreland:4246 to 4247)

[jonas oreland]

 4247 jonas oreland	2011-07-06
      ndb - rty to fix windows compile

    modified:
      storage/ndb/src/ndbjtie/jtie/jtie_tconv_idcache_impl.hpp
 4246 jonas oreland	2011-07-06 [merge]
      ndb - merge 70 to 71

    added:
      mysql-test/suite/ndb/include/ndb_share_check_shares.inc
      mysql-test/suite/ndb/r/ndb_share.result
      mysql-test/suite/ndb/t/ndb_share.cnf
      mysql-test/suite/ndb/t/ndb_share.test
    modified:
      mysql-test/suite/ndb/r/ndb_basic.result
      mysql-test/suite/ndb/t/ndb_basic.test
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster.h
      sql/ha_ndbcluster_binlog.cc
=== modified file 'storage/ndb/src/ndbjtie/jtie/jtie_tconv_idcache_impl.hpp'
--- a/storage/ndb/src/ndbjtie/jtie/jtie_tconv_idcache_impl.hpp	2011-07-06 06:16:40 +0000
+++ b/storage/ndb/src/ndbjtie/jtie/jtie_tconv_idcache_impl.hpp	2011-07-06 07:07:28 +0000
@@ -201,7 +201,11 @@ struct MemberId {
 //#ifndef NDEBUG // XXX for debugging
             // print error diagnostics
             char m[256];
+#ifndef _WIN32
             snprintf(m, 256, "JTie: failed to find Java class '%s'\n",
+#else
+            _snprintf(m, 256, "JTie: failed to find Java class '%s'\n",
+#endif
                      (C::class_name == NULL ? "NULL" : C::class_name));
             fprintf(stderr, m);
             env->ExceptionDescribe();

No bundle (reason: useless for push emails).