List:Commits« Previous MessageNext Message »
From:jonas oreland Date:April 19 2011 7:25pm
Subject:bzr push into mysql-5.1-telco-7.0 branch (jonas:4324 to 4325)
View as plain text  
 4325 jonas oreland	2011-04-19
      ndb - work-around for Sun CC-5.9 bug

    modified:
      storage/ndb/src/kernel/vm/mt.cpp
 4324 Magnus Blåudd	2011-04-19 [merge]
      Merge

    renamed:
      mysql-test/extra/rpl_tests/rpl_ndb_apply_status.test => mysql-test/suite/rpl_ndb/t/rpl_ndb_xxx_innodb.inc
      mysql-test/extra/rpl_tests/select_ndb_apply_status.inc => mysql-test/suite/rpl_ndb/t/select_ndb_apply_status.inc
    modified:
      mysql-test/suite/rpl_ndb/t/rpl_ndb_mix_innodb.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_xxx_innodb.inc
=== modified file 'storage/ndb/src/kernel/vm/mt.cpp'
--- a/storage/ndb/src/kernel/vm/mt.cpp	2011-02-23 19:28:26 +0000
+++ b/storage/ndb/src/kernel/vm/mt.cpp	2011-04-19 19:24:55 +0000
@@ -401,7 +401,8 @@ struct thr_safe_pool
 
   T* m_free_list;
   Uint32 m_cnt;
-  thr_spin_lock<NDB_CL - (sizeof(T*) + sizeof(Uint32))> m_lock;
+  static const unsigned TSP_SLSZ = NDB_CL - (sizeof(T*) + sizeof(Uint32));
+  thr_spin_lock<TSP_SLSZ> m_lock;
 
   T* seize(Ndbd_mem_manager *mm, Uint32 rg) {
     T* ret = 0;

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.1-telco-7.0 branch (jonas:4324 to 4325) jonas oreland19 Apr