From: Kent Boortz Date: July 4 2011 5:59pm Subject: bzr push into mysql-5.1-telco-7.1 branch (kent.boortz:4237 to 4238) List-Archive: http://lists.mysql.com/commits/140181 Message-Id: <20110704175907.8D86BF018F@tyr80.norway.sun.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 4238 Kent Boortz 2011-07-04 [merge] Updated/added copyright headers modified: mysql-test/include/mtr_check.sql mysql-test/include/mtr_warnings.sql storage/ndb/src/mgmsrv/Defragger.hpp 4237 Kent Boortz 2011-07-04 [merge] Updated/added copyright headers added: mysql-test/suite/ndb/bug12712109.ini mysql-test/suite/ndb/r/ndb_alter_table_online_multi.result mysql-test/suite/ndb/r/ndb_row_count.result mysql-test/suite/ndb/r/ndb_select_count.result mysql-test/suite/ndb/t/ndb_alter_table_online_multi.test mysql-test/suite/ndb/t/ndb_row_count.test mysql-test/suite/ndb/t/ndb_select_count.test mysql-test/suite/ndb_rpl/ndb_master-slave_2ch_end.inc mysql-test/suite/ndb_rpl/r/ndb_rpl_circular_2ch_rep_status.result mysql-test/suite/ndb_rpl/r/ndb_rpl_init_rep_status.result mysql-test/suite/ndb_rpl/t/ndb_rpl_circular_2ch_rep_status.cnf mysql-test/suite/ndb_rpl/t/ndb_rpl_circular_2ch_rep_status.test mysql-test/suite/ndb_rpl/t/ndb_rpl_init_rep_status.test sql/ha_ndb_index_stat.cc sql/ha_ndb_index_stat.h sql/ndb_mi.cc sql/ndb_mi.h storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/spi/QueryExecutionContext.java storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/QueryExecutionContextJDBCImpl.java storage/ndb/clusterj/clusterj-jdbc/src/test/java/jdbctest/BatchDeleteQueryAllPrimitivesTest.java storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryMultipleParameterTest.java storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryMultipleParameterTest.java storage/ndb/compile-cluster storage/ndb/include/kernel/signaldata/GetConfig.hpp storage/ndb/src/common/debugger/signaldata/GetConfig.cpp storage/ndb/src/ndbapi/NdbIndexStatFrmData.cpp storage/ndb/src/ndbapi/NdbIndexStatImpl.cpp storage/ndb/src/ndbapi/NdbIndexStatImpl.hpp storage/ndb/tools/ndb_dump_frm_data.cpp storage/ndb/tools/ndb_index_stat.cpp modified: configure.in libmysqld/Makefile.am mysql-test/suite/funcs_1/r/ndb_views.result mysql-test/suite/ndb/r/ndb_alter_table_online.result mysql-test/suite/ndb/r/ndb_basic.result mysql-test/suite/ndb/r/ndb_condition_pushdown.result mysql-test/suite/ndb/r/ndb_config.result mysql-test/suite/ndb/r/ndb_index_ordered.result mysql-test/suite/ndb/r/ndb_index_unique.result mysql-test/suite/ndb/r/ndb_multi.result mysql-test/suite/ndb/t/ndb_alter_table_online.test mysql-test/suite/ndb/t/ndb_basic.test mysql-test/suite/ndb/t/ndb_config.test mysql-test/suite/ndb/t/ndb_index_ordered.test mysql-test/suite/ndb/t/ndb_multi.test mysql-test/suite/ndb_rpl/my.cnf mysql-test/suite/ndb_rpl/ndb_master-slave_2ch.inc mysql-test/suite/ndb_rpl/r/ndb_rpl_circular_2ch.result mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_max.result mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_max_delete_win.result mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_old.result mysql-test/suite/ndb_rpl/r/ndb_rpl_rep_error.result mysql-test/suite/ndb_rpl/t/ndb_conflict_info.inc mysql-test/suite/ndb_rpl/t/ndb_conflict_info_init.inc mysql-test/suite/ndb_rpl/t/ndb_rpl_break_3_chain.cnf mysql-test/suite/ndb_rpl/t/ndb_rpl_circular_2ch.cnf mysql-test/suite/ndb_rpl/t/ndb_rpl_circular_2ch.test mysql-test/suite/ndb_rpl/t/ndb_rpl_multi_binlog_update.cnf mysql-test/suite/ndb_rpl/t/ndb_rpl_rep_error.test mysql-test/suite/ndb_team/my.cnf mysql-test/suite/rpl_ndb/my.cnf mysql-test/t/ctype_cp932_binlog_stm.test sql/Makefile.am sql/ha_ndbcluster.cc sql/ha_ndbcluster.h sql/ha_ndbcluster_binlog.cc sql/ha_ndbcluster_binlog.h sql/sql_class.cc sql/sql_class.h storage/ndb/CMakeLists.txt storage/ndb/Makefile.am storage/ndb/clusterj/CMakeLists.txt storage/ndb/clusterj/clusterj-core/Makefile.am storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/metadata/AbstractDomainFieldHandlerImpl.java storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/metadata/AbstractDomainTypeHandlerImpl.java storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/metadata/InvocationHandlerImpl.java storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/metadata/KeyValueHandlerImpl.java storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/AndPredicateImpl.java storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/BetweenPredicateImpl.java storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/CandidateIndexImpl.java storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/ComparativePredicateImpl.java storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/EqualPredicateImpl.java storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/GreaterEqualPredicateImpl.java storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/GreaterThanPredicateImpl.java storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/InPredicateImpl.java storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/LessEqualPredicateImpl.java storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/LessThanPredicateImpl.java storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/LikePredicateImpl.java storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/NotPredicateImpl.java storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/OrPredicateImpl.java storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/ParameterImpl.java storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/PredicateImpl.java storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/PropertyImpl.java storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/QueryDomainTypeImpl.java storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/QueryExecutionContextImpl.java storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/spi/DomainFieldHandler.java storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/ScanOperation.java storage/ndb/clusterj/clusterj-core/src/main/resources/com/mysql/clusterj/core/Bundle.properties storage/ndb/clusterj/clusterj-jdbc/Makefile.am storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/AbstractResultSetInternalMethods.java storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/InterceptorImpl.java storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/ResultSetInternalMethodsImpl.java storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/ResultSetInternalMethodsUpdateCount.java storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/SQLExecutor.java storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/ValueHandlerImpl.java storage/ndb/clusterj/clusterj-jdbc/src/main/resources/com/mysql/clusterj/jdbc/Bundle.properties storage/ndb/clusterj/clusterj-jdbc/src/test/java/jdbctest/JDBCQueryTest.java storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/Employee.java storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/LongIntStringFKOneOne.java storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/LongIntStringOid.java storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/LongIntStringPKOneOne.java storage/ndb/clusterj/clusterj-openjpa/src/main/java/com/mysql/clusterj/openjpa/NdbOpenJPADomainFieldHandlerImpl.java storage/ndb/clusterj/clusterj-test/Makefile.am storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryAllPrimitivesTest.java storage/ndb/clusterj/clusterj-test/src/main/resources/schema.sql storage/ndb/clusterj/clusterj-tie/pom.xml storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/ScanOperationImpl.java storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/Utility.java storage/ndb/clusterj/clusterj-tie/src/main/resources/com/mysql/clusterj/tie/Bundle.properties storage/ndb/config/type_JAVA.cmake storage/ndb/include/kernel/GlobalSignalNumbers.h storage/ndb/include/kernel/ndb_limits.h storage/ndb/include/kernel/signaldata/SignalData.hpp storage/ndb/include/mgmapi/mgmapi.h storage/ndb/include/mgmapi/mgmapi_config_parameters.h storage/ndb/include/mgmapi/ndb_logevent.h storage/ndb/include/ndb_constants.h storage/ndb/include/ndb_types.h.in storage/ndb/include/ndb_version.h.in storage/ndb/include/ndbapi/NdbApi.hpp storage/ndb/include/ndbapi/NdbDictionary.hpp storage/ndb/include/ndbapi/NdbIndexStat.hpp storage/ndb/ndb_configure.m4 storage/ndb/src/CMakeLists.txt storage/ndb/src/common/debugger/CMakeLists.txt storage/ndb/src/common/debugger/signaldata/CMakeLists.txt storage/ndb/src/common/debugger/signaldata/Makefile.am storage/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp storage/ndb/src/common/debugger/signaldata/SignalNames.cpp storage/ndb/src/common/logger/CMakeLists.txt storage/ndb/src/common/mgmcommon/CMakeLists.txt storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp storage/ndb/src/common/portlib/CMakeLists.txt storage/ndb/src/common/transporter/CMakeLists.txt storage/ndb/src/common/transporter/TransporterRegistry.cpp storage/ndb/src/common/util/CMakeLists.txt storage/ndb/src/common/util/ndbzio.c storage/ndb/src/kernel/CMakeLists.txt storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp storage/ndb/src/kernel/blocks/dbspj/Dbspj.hpp storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp storage/ndb/src/kernel/blocks/dbtux/DbtuxStat.cpp storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp storage/ndb/src/kernel/blocks/suma/Suma.cpp storage/ndb/src/kernel/blocks/trix/Trix.cpp storage/ndb/src/kernel/vm/Configuration.cpp storage/ndb/src/kernel/vm/Configuration.hpp storage/ndb/src/kernel/vm/NdbSeqLock.hpp storage/ndb/src/mgmapi/CMakeLists.txt storage/ndb/src/mgmapi/mgmapi.cpp storage/ndb/src/mgmapi/mgmapi_internal.h storage/ndb/src/mgmsrv/CMakeLists.txt storage/ndb/src/mgmsrv/ConfigInfo.cpp storage/ndb/src/mgmsrv/Defragger.hpp 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/ClusterMgr.cpp 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/NdbEventOperationImpl.cpp storage/ndb/src/ndbapi/NdbIndexStat.cpp storage/ndb/src/ndbapi/NdbQueryBuilder.cpp storage/ndb/src/ndbapi/NdbQueryBuilder.hpp storage/ndb/src/ndbapi/NdbQueryBuilderImpl.hpp storage/ndb/src/ndbapi/NdbQueryOperation.cpp storage/ndb/src/ndbapi/NdbQueryOperation.hpp storage/ndb/src/ndbapi/NdbQueryOperationImpl.hpp storage/ndb/src/ndbapi/NdbTransaction.cpp storage/ndb/src/ndbapi/Ndberr.cpp storage/ndb/src/ndbapi/Ndbif.cpp storage/ndb/src/ndbapi/ndberror.c storage/ndb/src/ndbjtie/jtie/jtie_tconv_idcache_impl.hpp storage/ndb/src/ndbjtie/jtie/jtie_tconv_object.hpp storage/ndb/src/ndbjtie/jtie/jtie_tconv_object_impl.hpp storage/ndb/src/ndbjtie/jtie/jtie_tconv_ptrbybb_impl.hpp storage/ndb/src/ndbjtie/jtie/test/myjapi/test/MyJapiTest.java storage/ndb/src/ndbjtie/mysql/CMakeLists.txt storage/ndb/test/crund/build.xml storage/ndb/test/crund/config_samples/crundClusterj.properties storage/ndb/test/crund/config_samples/crundDerby.properties storage/ndb/test/crund/config_samples/crundMysql.properties storage/ndb/test/crund/config_samples/crundNdbapi.properties storage/ndb/test/crund/config_samples/crundNdbj.properties storage/ndb/test/crund/config_samples/crundNdbjtie.properties storage/ndb/test/crund/config_samples/crundOpenjpaClusterj.properties storage/ndb/test/crund/config_samples/crundOpenjpaDerby.properties storage/ndb/test/crund/config_samples/crundOpenjpaMysql.properties storage/ndb/test/crund/config_samples/crundRun.properties storage/ndb/test/crund/config_samples/env.properties storage/ndb/test/crund/src/com/mysql/cluster/crund/ClusterjLoad.java storage/ndb/test/crund/src/com/mysql/cluster/crund/CrundDriver.java storage/ndb/test/crund/src/com/mysql/cluster/crund/Driver.java storage/ndb/test/crund/src/com/mysql/cluster/crund/JdbcLoad.java storage/ndb/test/crund/src/com/mysql/cluster/crund/JpaLoad.java storage/ndb/test/crund/src/com/mysql/cluster/crund/NdbApiLoad.java storage/ndb/test/crund/src/com/mysql/cluster/crund/NdbJTieLoad.java storage/ndb/test/crund/src/com/mysql/cluster/crund/NdbjLoad.java storage/ndb/test/crund/src/com/mysql/cluster/crund/ResultProcessor.java storage/ndb/test/crund/src/crundndb/Driver.cpp storage/ndb/test/crund/src/crundndb/Driver.hpp storage/ndb/test/include/HugoQueryBuilder.hpp storage/ndb/test/ndbapi/testBasic.cpp storage/ndb/test/ndbapi/testIndexStat.cpp storage/ndb/test/ndbapi/testMgm.cpp storage/ndb/test/ndbapi/testMgmd.cpp storage/ndb/test/ndbapi/testScan.cpp storage/ndb/test/ndbapi/testSystemRestart.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/daily-basic-tests.txt storage/ndb/test/src/HugoQueryBuilder.cpp storage/ndb/test/src/NDBT_Find.cpp storage/ndb/test/src/NdbBackup.cpp storage/ndb/tools/CMakeLists.txt storage/ndb/tools/Makefile.am storage/ndb/tools/ndb_config.cpp Diff too large for email (21047 lines, the limit is 10000). No bundle (reason: useless for push emails).