bzr push into mysql-5.1-telco-7.0 branch (jonas.oreland:4555 to 4556)

[Jonas Oreland]

 4556 Jonas Oreland	2011-09-28
      ndb - enable frazers new tests also in 7.0...(i'd be disappointed if windows doesn't get red now)

    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
 4555 jonas oreland	2011-09-27
      ndb - implemented mutex deadlock detector ala linux kernel lockdep
        (google linux kernel lockdep dor description)
        1) currently only active if setting NDB_EXTRA_FLAGS=-DNDB_MUTEX_DEADLOCK_DETECTOR
        2) only "monitors" NdbMutex (e.g not mysql mutexes)
        3) only supports basic/simple schemes...i.e not nested locking etc..
           (but we don't use that anyway)
      
        Found the ndb_mgmd mutex deadlock directly
        When a potential deadlock is detected, code aborts

    added:
      storage/ndb/src/common/portlib/NdbMutex_DeadlockDetector.cpp
      storage/ndb/src/common/portlib/NdbMutex_DeadlockDetector.h
    modified:
      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
=== modified file 'mysql-test/suite/ndb_binlog/t/ndb_binlog_log_transaction_id-master.opt'
--- a/mysql-test/suite/ndb_binlog/t/ndb_binlog_log_transaction_id-master.opt	2011-09-07 22:50:01 +0000
+++ b/mysql-test/suite/ndb_binlog/t/ndb_binlog_log_transaction_id-master.opt	2011-09-28 09:40:14 +0000
@@ -1 +1 @@
---ndb-log-transaction-id
+--ndb-log-transaction-id --log-bin-use-v1-row-events=false

=== modified file 'mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_epoch_trans.cnf'
--- a/mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_epoch_trans.cnf	2011-09-07 22:50:01 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_epoch_trans.cnf	2011-09-28 09:40:14 +0000
@@ -11,10 +11,14 @@
 # Potential infinite loops are broken by both servers
 # on each cluster having the same server-id
 
+[cluster_config.slave]
+mysqld=,
+
 [mysqld]
 log-slave-updates
 ndb-log-apply-status
 ndb-log-transaction-id
+log-bin-use-v1-row-events=false
 
 [mysqld.1.1]
 server-id= 1

No bundle (reason: useless for push emails).