bzr push into mysql-5.1-telco-7.1 branch (john.duncan:4294 to 4295)

[John David Duncan]

 4295 John David Duncan	2011-09-30
      This patch eliminates a warning that some Java compilers give because of a non-ascii character inside a comment.

    modified:
      storage/ndb/src/ndbjtie/test/test/MySqlUtilsCharsetMapTest.java
 4294 Jonas Oreland	2011-09-28 [merge]
      ndb - merge 70 to 71

    added:
      storage/ndb/src/common/portlib/NdbMutex_DeadlockDetector.cpp
      storage/ndb/src/common/portlib/NdbMutex_DeadlockDetector.h
    modified:
      mysql-test/suite/ndb_binlog/t/ndb_binlog_log_transaction_id-master.opt
      mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_epoch_trans.cnf
      storage/ndb/include/portlib/NdbMutex.h
      storage/ndb/src/common/portlib/CMakeLists.txt
      storage/ndb/src/common/portlib/Makefile.am
      storage/ndb/src/common/portlib/NdbCondition.c
      storage/ndb/src/common/portlib/NdbMutex.c
      storage/ndb/src/common/portlib/NdbThread.c
      storage/ndb/src/common/util/ndb_init.cpp
      storage/ndb/src/kernel/vm/ArrayPool.hpp
      storage/ndb/src/kernel/vm/Emulator.cpp
      storage/ndb/src/mgmsrv/MgmtSrvr.cpp
      storage/ndb/test/ndbapi/testNdbApi.cpp
      storage/ndb/test/ndbapi/testRestartGci.cpp
      storage/ndb/test/ndbapi/test_event.cpp
      storage/ndb/test/run-test/daily-basic-tests.txt
      storage/ndb/test/tools/hugoJoin.cpp
=== modified file 'storage/ndb/src/ndbjtie/test/test/MySqlUtilsCharsetMapTest.java'
--- a/storage/ndb/src/ndbjtie/test/test/MySqlUtilsCharsetMapTest.java	2011-02-02 09:52:33 +0000
+++ b/storage/ndb/src/ndbjtie/test/test/MySqlUtilsCharsetMapTest.java	2011-09-30 15:21:28 +0000
@@ -118,7 +118,7 @@ public class MySqlUtilsCharsetMapTest ex
         out.println("  <-- Test CharsetMap::getName()");
         
         /* Now we're going to recode. 
-         We test with the string "ülker", which begins with the character
+         We test with a string that begins with the character
          LATIN SMALL LETTER U WITH DIARESIS - unicode code point U+00FC.
          In the latin1 encoding this is a literal 0xFC,
          but in the UTF-8 representation it is 0xC3 0xBC.

No bundle (reason: useless for push emails).