From: magnus.blaudd Date: June 8 2011 1:35pm Subject: bzr push into mysql-trunk-cluster branch (magnus.blaudd:3315 to 3316) WL#5185 List-Archive: http://lists.mysql.com/commits/138861 MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3316 magnus.blaudd@stripped 2011-06-08 Cherry pick follow up fix for WL#5185 modified: client/mysqltest.cc 3315 magnus.blaudd@stripped 2011-06-08 [merge] Merge 5.5-cluster -> trunk-cluster added: mysql-test/suite/ndb/r/ndb_dd_bug12581213.result mysql-test/suite/ndb/t/ndb_dd_bug12581213.cnf mysql-test/suite/ndb/t/ndb_dd_bug12581213.test storage/ndb/cmake/os/ storage/ndb/cmake/os/Windows.cmake storage/ndb/cmake/os/WindowsCache.cmake storage/ndb/include/kernel/signaldata/IndexStatSignal.hpp storage/ndb/include/util/NdbPack.hpp storage/ndb/src/common/debugger/signaldata/IndexStatSignal.cpp storage/ndb/src/common/util/NdbPack.cpp storage/ndb/src/ndbapi/NdbIndexStatImpl.cpp storage/ndb/src/ndbapi/NdbIndexStatImpl.hpp storage/ndb/tools/ndb_index_stat.cpp modified: VERSION mysql-test/suite/ndb/r/ndbinfo.result mysql-test/suite/ndb/t/ndbinfo.test mysql-test/suite/ndb_rpl/t/disabled.def mysql-test/suite/rpl_ndb/t/disabled.def mysql-test/t/disabled.def sql/ha_ndbcluster.cc sql/ha_ndbcluster.h sql/ha_ndbinfo.cc sql/ha_ndbinfo.h storage/ndb/CMakeLists.txt storage/ndb/include/kernel/AttributeHeader.hpp storage/ndb/include/kernel/GlobalSignalNumbers.h storage/ndb/include/kernel/kernel_types.h storage/ndb/include/kernel/ndb_limits.h storage/ndb/include/kernel/signaldata/AccScan.hpp storage/ndb/include/kernel/signaldata/DiGetNodes.hpp storage/ndb/include/kernel/signaldata/FireTrigOrd.hpp storage/ndb/include/kernel/signaldata/ScanFrag.hpp storage/ndb/include/kernel/signaldata/SignalData.hpp storage/ndb/include/kernel/signaldata/SumaImpl.hpp storage/ndb/include/kernel/signaldata/TupCommit.hpp storage/ndb/include/kernel/signaldata/TuxBound.hpp storage/ndb/include/kernel/signaldata/TuxContinueB.hpp storage/ndb/include/kernel/signaldata/UtilRelease.hpp storage/ndb/include/mgmapi/mgmapi_config_parameters.h storage/ndb/include/ndb_constants.h storage/ndb/include/ndb_version.h.in storage/ndb/include/ndbapi/NdbApi.hpp storage/ndb/include/ndbapi/NdbDictionary.hpp storage/ndb/include/ndbapi/NdbEventOperation.hpp storage/ndb/include/ndbapi/NdbIndexStat.hpp storage/ndb/include/ndbapi/NdbOperation.hpp storage/ndb/include/ndbapi/NdbTransaction.hpp storage/ndb/include/ndbapi/ndb_cluster_connection.hpp storage/ndb/include/transporter/TransporterRegistry.hpp storage/ndb/include/util/NdbSqlUtil.hpp storage/ndb/ndb_configure.cmake storage/ndb/ndb_configure.m4 storage/ndb/src/common/debugger/signaldata/CMakeLists.txt storage/ndb/src/common/debugger/signaldata/Makefile.am storage/ndb/src/common/debugger/signaldata/ScanFrag.cpp storage/ndb/src/common/debugger/signaldata/SchemaTransImpl.cpp storage/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp storage/ndb/src/common/debugger/signaldata/SignalNames.cpp storage/ndb/src/common/debugger/signaldata/SumaImpl.cpp storage/ndb/src/common/debugger/signaldata/TcKeyReq.cpp storage/ndb/src/common/portlib/CMakeLists.txt storage/ndb/src/common/transporter/Transporter.cpp storage/ndb/src/common/transporter/Transporter.hpp storage/ndb/src/common/transporter/TransporterRegistry.cpp storage/ndb/src/common/util/CMakeLists.txt storage/ndb/src/common/util/Makefile.am storage/ndb/src/common/util/NdbSqlUtil.cpp storage/ndb/src/common/util/ndbzio.c storage/ndb/src/kernel/blocks/ERROR_codes.txt storage/ndb/src/kernel/blocks/LocalProxy.cpp storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp storage/ndb/src/kernel/blocks/dbtc/DbtcProxy.cpp storage/ndb/src/kernel/blocks/dbtc/DbtcProxy.hpp storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp storage/ndb/src/kernel/blocks/dbtux/DbtuxBuild.cpp storage/ndb/src/kernel/blocks/dbtux/DbtuxCmp.cpp storage/ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp storage/ndb/src/kernel/blocks/dbtux/DbtuxMaint.cpp storage/ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp storage/ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp storage/ndb/src/kernel/blocks/dbtux/DbtuxProxy.cpp storage/ndb/src/kernel/blocks/dbtux/DbtuxProxy.hpp storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp storage/ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp storage/ndb/src/kernel/blocks/dbtux/DbtuxStat.cpp storage/ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp storage/ndb/src/kernel/blocks/ndbfs/AsyncIoThread.cpp storage/ndb/src/kernel/blocks/ndbfs/AsyncIoThread.hpp storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.hpp storage/ndb/src/kernel/blocks/ndbfs/Pool.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/blocks/suma/Suma.cpp storage/ndb/src/kernel/blocks/suma/Suma.hpp storage/ndb/src/kernel/blocks/trix/Trix.cpp storage/ndb/src/kernel/blocks/trix/Trix.hpp storage/ndb/src/mgmsrv/Config.hpp storage/ndb/src/mgmsrv/ConfigInfo.cpp storage/ndb/src/mgmsrv/MgmtSrvr.cpp storage/ndb/src/mgmsrv/MgmtSrvr.hpp storage/ndb/src/mgmsrv/Services.cpp storage/ndb/src/ndbapi/API.hpp storage/ndb/src/ndbapi/CMakeLists.txt storage/ndb/src/ndbapi/Makefile.am storage/ndb/src/ndbapi/NdbDictionary.cpp storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp storage/ndb/src/ndbapi/NdbEventOperation.cpp storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp storage/ndb/src/ndbapi/NdbIndexStat.cpp storage/ndb/src/ndbapi/NdbInfo.cpp storage/ndb/src/ndbapi/NdbInfo.hpp storage/ndb/src/ndbapi/NdbInfoRecAttr.hpp storage/ndb/src/ndbapi/NdbInfoScanOperation.cpp storage/ndb/src/ndbapi/NdbOperationExec.cpp storage/ndb/src/ndbapi/NdbQueryBuilder.cpp storage/ndb/src/ndbapi/NdbQueryOperation.cpp storage/ndb/src/ndbapi/NdbScanOperation.cpp storage/ndb/src/ndbapi/NdbTransaction.cpp storage/ndb/src/ndbapi/Ndberr.cpp storage/ndb/src/ndbapi/Ndbif.cpp storage/ndb/src/ndbapi/TransporterFacade.hpp storage/ndb/src/ndbapi/ndb_cluster_connection.cpp storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp storage/ndb/src/ndbapi/ndberror.c storage/ndb/test/include/HugoOperations.hpp storage/ndb/test/include/HugoTransactions.hpp storage/ndb/test/ndbapi/testBasic.cpp storage/ndb/test/ndbapi/testIndex.cpp storage/ndb/test/ndbapi/testIndexStat.cpp storage/ndb/test/ndbapi/testRestartGci.cpp storage/ndb/test/ndbapi/test_event.cpp storage/ndb/test/run-test/atrt-backtrace.sh storage/ndb/test/run-test/atrt-gather-result.sh storage/ndb/test/run-test/atrt-setup.sh storage/ndb/test/run-test/autotest-boot.sh storage/ndb/test/run-test/autotest-run.sh storage/ndb/test/run-test/conf-blade08.cnf storage/ndb/test/run-test/conf-dl145a.cnf storage/ndb/test/run-test/conf-fimafeng08.cnf storage/ndb/test/run-test/conf-fimafeng09.cnf* storage/ndb/test/run-test/conf-loki27.cnf* storage/ndb/test/run-test/conf-ndb07.cnf storage/ndb/test/run-test/conf-ndbmaster.cnf storage/ndb/test/run-test/conf-repl.cnf storage/ndb/test/run-test/conf-techra29.cnf* storage/ndb/test/run-test/conf-test.cnf storage/ndb/test/run-test/conf-tyr64.cnf* storage/ndb/test/run-test/conf-upgrade.cnf storage/ndb/test/run-test/daily-basic-tests.txt storage/ndb/test/src/HugoOperations.cpp storage/ndb/test/src/HugoTransactions.cpp storage/ndb/test/tools/hugoPkUpdate.cpp storage/ndb/tools/CMakeLists.txt storage/ndb/tools/Makefile.am storage/ndb/tools/ndb_config.cpp storage/ndb/tools/ndbinfo_sql.cpp storage/ndb/tools/restore/Restore.cpp === modified file 'client/mysqltest.cc' --- a/client/mysqltest.cc 2011-05-20 11:50:50 +0000 +++ b/client/mysqltest.cc 2011-06-08 13:34:57 +0000 @@ -4202,7 +4202,9 @@ int do_save_master_pos() */ { ulong have_ndbcluster; - if (mysql_query(mysql, query= "show variables like 'have_ndbcluster'")) + if (mysql_query(mysql, query= "select support " + "from information_schema.engines " + "where engine='ndbcluster'")) die("'%s' failed: %d %s", query, mysql_errno(mysql), mysql_error(mysql)); if (!(res= mysql_store_result(mysql))) @@ -4210,7 +4212,7 @@ int do_save_master_pos() if (!(row= mysql_fetch_row(res))) die("Query '%s' returned empty result", query); - have_ndbcluster= strcmp("YES", row[1]) == 0; + have_ndbcluster= strcmp("YES", row[0]) == 0; mysql_free_result(res); if (have_ndbcluster) No bundle (reason: useless for push emails).