From: Frazer Clement Date: January 11 2012 6:32pm Subject: bzr push into mysql-5.1-telco-7.1 branch (frazer.clement:4408 to 4409) List-Archive: http://lists.mysql.com/commits/142373 Message-Id: <201201111832.q0BIW4U1013412@acsmt357.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 4409 Frazer Clement 2012-01-11 [merge] Merge 7.0->7.1 modified: mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict.result mysql-test/suite/ndb_rpl/t/show_mysqld_warnings.inc storage/ndb/src/kernel/blocks/trpman.cpp storage/ndb/src/kernel/vm/Configuration.cpp 4408 Jonas Oreland 2012-01-11 [merge] ndb - merge 70 to 71 added: mysql-test/suite/ndb_rpl/t/show_mysqld_warnings.inc modified: mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict.result mysql-test/suite/ndb_rpl/r/ndb_rpl_rep_error.result mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict.test mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_epoch.test mysql-test/suite/ndb_rpl/t/ndb_rpl_rep_error.test sql/ha_ndbcluster.cc sql/ha_ndbcluster.h sql/ha_ndbcluster_binlog.cc sql/ha_ndbcluster_binlog.h storage/ndb/include/kernel/NodeInfo.hpp storage/ndb/include/ndb_global.h storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp storage/ndb/src/kernel/vm/ArrayPool.hpp storage/ndb/src/kernel/vm/GlobalData.hpp storage/ndb/src/kernel/vm/SimulatedBlock.cpp storage/ndb/src/kernel/vm/TransporterCallback.cpp storage/ndb/src/kernel/vm/mt.cpp === modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict.result' --- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict.result 2012-01-11 11:07:09 +0000 +++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict.result 2012-01-11 16:08:31 +0000 @@ -257,22 +257,22 @@ show variables like 'server_id'; Variable_name Value server_id 1 MySQLD error output for server 1.1 matching pattern %NDB Slave% -right(txt, length(txt) - locate('[',txt) + 1) -[Note] NDB Slave: Table test.t2diffex using conflict_fn NDB$OLD on attribute X. -[Note] NDB Slave: Table test.t2diffex logging exceptions to test.t2diffex$EX -[Note] NDB Slave: Table test.t1allsame using conflict_fn NDB$MAX on attribute X. -[Note] NDB Slave: Table test.t2_max using conflict_fn NDB$MAX on attribute X. +relevant +[note] ndb slave: table test.t2diffex using conflict_fn ndb$old on attribute x. +[note] ndb slave: table test.t2diffex logging exceptions to test.t2diffex$ex +[note] ndb slave: table test.t1allsame using conflict_fn ndb$max on attribute x. +[note] ndb slave: table test.t2_max using conflict_fn ndb$max on attribute x. show variables like 'server_id'; Variable_name Value server_id 3 MySQLD error output for server 2.1 matching pattern %NDB Slave% -right(txt, length(txt) - locate('[',txt) + 1) -[Warning] NDB Slave: Table test.t3oneex : No extra row author bits in table. -[Note] NDB Slave: Table test.t3oneex : CFT_NDB_EPOCH[_TRANS], low epoch resolution -[Note] NDB Slave: Table test.t2diffex using conflict_fn NDB$MAX on attribute X. -[Note] NDB Slave: Table test.t2diffex logging exceptions to test.t2diffex$EX -[Note] NDB Slave: Table test.t1allsame using conflict_fn NDB$MAX on attribute X. -[Note] NDB Slave: Table test.t2_max using conflict_fn NDB$MAX on attribute X. +relevant +[warning] ndb slave: table test.t3oneex : no extra row author bits in table. +[note] ndb slave: table test.t3oneex : cft_ndb_epoch[_trans], low epoch resolution +[note] ndb slave: table test.t2diffex using conflict_fn ndb$max on attribute x. +[note] ndb slave: table test.t2diffex logging exceptions to test.t2diffex$ex +[note] ndb slave: table test.t1allsame using conflict_fn ndb$max on attribute x. +[note] ndb slave: table test.t2_max using conflict_fn ndb$max on attribute x. drop table t3oneex, t2diffex, t1allsame, t3oneex$EX, t2diffex$EX; "Cleanup" drop table mysql.ndb_replication; === modified file 'mysql-test/suite/ndb_rpl/t/show_mysqld_warnings.inc' --- a/mysql-test/suite/ndb_rpl/t/show_mysqld_warnings.inc 2012-01-11 11:07:09 +0000 +++ b/mysql-test/suite/ndb_rpl/t/show_mysqld_warnings.inc 2012-01-11 16:08:31 +0000 @@ -4,7 +4,7 @@ create table errlog (a int auto_incremen --eval load data local infile "$MYSQLTEST_VARDIR/log/mysqld.$server_num.err" into table errlog (txt); ---eval select right(txt, length(txt) - locate('[',txt) + 1) from errlog where txt like '$pattern' order by a desc limit $limit; +--eval select lower(right(txt, length(txt) - locate('[',txt) + 1)) as relevant from errlog where txt like '$pattern' order by a desc limit $limit; drop table errlog; --enable_query_log === modified file 'storage/ndb/src/kernel/blocks/trpman.cpp' --- a/storage/ndb/src/kernel/blocks/trpman.cpp 2012-01-10 13:54:55 +0000 +++ b/storage/ndb/src/kernel/blocks/trpman.cpp 2012-01-11 15:43:32 +0000 @@ -702,7 +702,7 @@ TrpmanProxy::sendCLOSE_COMCONF(Signal *s CloseComReqConf* conf = (CloseComReqConf*)signal->getDataPtrSend(); *conf = ss.m_req; - sendSignal(conf->xxxBlockRef, GSN_CLOSE_COMCONF, signal, + sendSignal(QMGR_REF, GSN_CLOSE_COMCONF, signal, CloseComReqConf::SignalLength, JBB); ssRelease(ssId); } === modified file 'storage/ndb/src/kernel/vm/Configuration.cpp' --- a/storage/ndb/src/kernel/vm/Configuration.cpp 2012-01-10 17:54:59 +0000 +++ b/storage/ndb/src/kernel/vm/Configuration.cpp 2012-01-11 16:31:21 +0000 @@ -682,6 +682,12 @@ Configuration::calcSizeAlt(ConfigValues lqhInstances = globalData.ndbMtLqhWorkers; } + Uint32 tcInstances = 1; + if (globalData.ndbMtTcThreads > 1) + { + tcInstances = globalData.ndbMtTcThreads; + } + Uint64 indexMem = 0, dataMem = 0; ndb_mgm_get_int64_parameter(&db, CFG_DB_DATA_MEM, &dataMem); ndb_mgm_get_int64_parameter(&db, CFG_DB_INDEX_MEM, &indexMem); @@ -808,7 +814,8 @@ Configuration::calcSizeAlt(ConfigValues #if NDB_VERSION_D < NDB_MAKE_VERSION(7,2,0) noOfLocalScanRecords = (noOfDBNodes * noOfScanRecords) + #else - noOfLocalScanRecords = 4 * (noOfDBNodes * noOfScanRecords) + + noOfLocalScanRecords = tcInstances * lqhInstances * + (noOfDBNodes * noOfScanRecords) + #endif 1 /* NR */ + 1 /* LCP */; No bundle (reason: useless for push emails).