From: magnus.blaudd Date: May 24 2011 12:09pm Subject: bzr push into mysql-5.5-cluster branch (magnus.blaudd:3341 to 3342) List-Archive: http://lists.mysql.com/commits/137983 Message-Id: <20110524120910.4790E13402B@pilot> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3342 magnus.blaudd@stripped 2011-05-24 Bug 12585902 - file_contents.test fails when building from "bzr export" - disable file_contents.test modified: mysql-test/t/disabled.def 3341 magnus.blaudd@stripped 2011-05-24 [merge] Merge 7.0 -> 5.5-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/util/NdbPack.hpp storage/ndb/src/common/util/NdbPack.cpp modified: CMakeLists.txt VERSION mysql-test/suite/ndb/r/ndbinfo.result mysql-test/suite/ndb/t/ndbinfo.test sql/ha_ndbinfo.cc sql/ha_ndbinfo.h storage/ndb/CMakeLists.txt storage/ndb/include/ndbapi/ndb_cluster_connection.hpp storage/ndb/include/util/NdbSqlUtil.hpp storage/ndb/ndb_configure.cmake storage/ndb/ndb_configure.m4 storage/ndb/src/common/util/CMakeLists.txt storage/ndb/src/common/util/Makefile.am storage/ndb/src/common/util/NdbSqlUtil.cpp storage/ndb/src/kernel/blocks/ERROR_codes.txt storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.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/dbtup/Dbtup.hpp storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.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/DbtuxScan.cpp storage/ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp storage/ndb/src/kernel/blocks/dbtux/DbtuxStat.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/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/NdbQueryBuilder.cpp storage/ndb/src/ndbapi/NdbScanOperation.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/test/ndbapi/testRestartGci.cpp 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/tools/ndbinfo_sql.cpp === modified file 'mysql-test/t/disabled.def' --- a/mysql-test/t/disabled.def 2011-05-10 09:48:14 +0000 +++ b/mysql-test/t/disabled.def 2011-05-24 12:08:47 +0000 @@ -17,3 +17,4 @@ sum_distinct-big : Bug#56927 201 alter_table-big : Bug#37248 2010-11-15 mattiasj was not tested create-big : Bug#37248 2010-11-15 mattiasj was not tested archive-big : Bug#11817185 2011-03-10 Anitha Disabled since this leads to timeout on Solaris Sparc +file_contents : Bug#12585902 file_contents.test fails when building from "bzr export" No bundle (reason: useless for push emails).