List:Commits« Previous MessageNext Message »
From:magnus.blaudd Date:May 2 2012 8:26pm
Subject:bzr push into mysql-trunk-cluster branch (magnus.blaudd:3487 to 3490) WL#6224
View as plain text  
 3490 magnus.blaudd@stripped	2012-05-02
      WL#6224 Adapt MySQL Cluster to 5.6
       - Handle new datatypes MYSQL_TYPE_TIMESTAMP2(not used),
         MYSQL_TYPE_TIME2 and MYSQL_TYPE_DATE2 in condition pushown code.
       - Update .result file for EXPLAIN which now always uses
         NULL for empty Extra column
       - Update .result file for removed colon after 
         text "Using where with pushed condition" for Extra column

    modified:
      mysql-test/suite/ndb/r/ndb_condition_pushdown.result
      sql/ha_ndbcluster_cond.cc
 3489 magnus.blaudd@stripped	2012-05-02
      WL#6224 Adapt MySQL Cluster to 5.6
       - Change storage/ndb/compile-cluster to automatically switch
         to g++ instead of gcc for CXX compiler
       - Change storage/ndb/compile-cluster to automatically remove
         -fno-exceptions from CXXFLAGS

    modified:
      storage/ndb/compile-cluster
 3488 magnus.blaudd@stripped	2012-05-02
      WL#6224 Adapt MySQl Cluster to 5.6
       - update yet another .result file for test using
       include/show_binlog_events.inc which now "pretty prints"
       the events

    modified:
      mysql-test/suite/ndb_binlog/r/ndb_binlog_index.result
 3487 magnus.blaudd@stripped	2012-05-02 [merge]
      Merge 7.3 -> trunk-cluster

    added:
      mysql-test/suite/ndb_binlog/r/ndb_binlog_index.result
      mysql-test/suite/ndb_binlog/t/ndb_binlog_check_binlog_index.inc
      mysql-test/suite/ndb_binlog/t/ndb_binlog_index.test
      mysql-test/suite/ndb_binlog/t/ndb_binlog_index_test_schema_independent.inc
      mysql-test/suite/ndb_memcache/r/math3.result
      mysql-test/suite/ndb_memcache/t/math3.test
      mysql-test/suite/sys_vars/r/transaction_allow_batching_basic.result
      mysql-test/suite/sys_vars/t/transaction_allow_batching_basic.test
      storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordIndexScanOperationImpl.java
      storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordScanOperationImpl.java
      storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordScanResultDataImpl.java
      storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordTableScanOperationImpl.java
      storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordUniqueKeyOperationImpl.java
      storage/ndb/clusterj/clusterj-unit/
      storage/ndb/clusterj/clusterj-unit/pom.xml
      storage/ndb/clusterj/clusterj-unit/src/
      storage/ndb/clusterj/clusterj-unit/src/main/
      storage/ndb/clusterj/clusterj-unit/src/main/java/
      storage/ndb/clusterj/clusterj-unit/src/main/java/junit/
      storage/ndb/clusterj/clusterj-unit/src/main/java/junit/framework/
      storage/ndb/clusterj/clusterj-unit/src/main/java/junit/framework/AssertionFailedError.java
      storage/ndb/clusterj/clusterj-unit/src/main/java/junit/framework/Test.java
      storage/ndb/clusterj/clusterj-unit/src/main/java/junit/framework/TestCase.java
      storage/ndb/clusterj/clusterj-unit/src/main/java/junit/framework/TestListener.java
      storage/ndb/clusterj/clusterj-unit/src/main/java/junit/framework/TestResult.java
      storage/ndb/clusterj/clusterj-unit/src/main/java/junit/framework/TestSuite.java
      storage/ndb/clusterj/clusterj-unit/src/main/java/junit/textui/
      storage/ndb/clusterj/clusterj-unit/src/main/java/junit/textui/TestRunner.java
      storage/ndb/clusterj/clusterj-unit/src/main/java/org/
      storage/ndb/clusterj/clusterj-unit/src/main/java/org/junit/
      storage/ndb/clusterj/clusterj-unit/src/main/java/org/junit/Ignore.java
      storage/ndb/memcache/unit/sequence.pl
      storage/ndb/src/kernel/vm/mt-lock.hpp
      storage/ndb/src/kernel/vm/mt-send-t.cpp
      storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NDBAPIConst.java
      storage/ndb/src/ndbjtie/test/ndbjtie_unit_tests_consts.cpp
      storage/ndb/src/ndbjtie/test/ndbjtie_unit_tests_consts.hpp
      storage/ndb/src/ndbjtie/test/ndbjtie_unit_tests_lib.cpp
      storage/ndb/src/ndbjtie/test/test/NdbJTieConstantsTest.java
      storage/ndb/src/ndbjtie/test/test_ndbjtie_constants.cmd.in
      storage/ndb/src/ndbjtie/test/test_ndbjtie_constants.sh.in
      storage/ndb/src/ndbjtie/test/test_unload_ndbjtie_constants.cmd.in
      storage/ndb/src/ndbjtie/test/test_unload_ndbjtie_constants.sh.in
    renamed:
      mysql-test/suite/ndb_rpl/t/ndb_rpl_relayrotate-slave.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_relayrotate-slave.opt.THIS
    modified:
      .bzrignore
      VERSION
      man/CMakeLists.txt
      mysql-test/include/wait_for_ndb_to_binlog.inc
      mysql-test/lib/My/ConfigFactory.pm
      mysql-test/lib/My/Memcache.pm
      mysql-test/lib/mtr_cases.pm
      mysql-test/mysql-test-run.pl
      mysql-test/suite/funcs_1/r/is_columns_mysql.result
      mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result
      mysql-test/suite/ndb/include/ndb_share_check_shares.inc
      mysql-test/suite/ndb/r/ndb_add_partition.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_dbug_tc_select.result
      mysql-test/suite/ndb/r/ndb_ddl_open_trans.result
      mysql-test/suite/ndb/r/ndb_global_schema_lock.result
      mysql-test/suite/ndb/r/ndb_index_stat_restart.result
      mysql-test/suite/ndb/r/ndb_join_pushdown_default.result
      mysql-test/suite/ndb/r/ndb_join_pushdown_nobnl.result
      mysql-test/suite/ndb/r/ndb_join_pushdown_none.result
      mysql-test/suite/ndb/r/ndb_share.result
      mysql-test/suite/ndb/r/ndb_statistics0.result
      mysql-test/suite/ndb/r/ndb_statistics1.result
      mysql-test/suite/ndb/t/disabled.def
      mysql-test/suite/ndb/t/ndb_add_partition.test
      mysql-test/suite/ndb/t/ndb_addnode.test
      mysql-test/suite/ndb/t/ndb_alter_table_online.test
      mysql-test/suite/ndb/t/ndb_basic.test
      mysql-test/suite/ndb/t/ndb_ddl_open_trans.test
      mysql-test/suite/ndb/t/ndb_index_stat_restart.test
      mysql-test/suite/ndb/t/ndb_join_pushdown.inc
      mysql-test/suite/ndb_binlog/r/ndb_binlog_ignore_db.result
      mysql-test/suite/ndb_binlog/t/ndb_binlog_ignore_db.test
      mysql-test/suite/ndb_memcache/include/have_memcache.inc
      mysql-test/suite/ndb_memcache/include/memcached_wait_for_ready.inc
      mysql-test/suite/ndb_memcache/include/wait_for_reconf.inc
      mysql-test/suite/ndb_memcache/my.cnf
      mysql-test/suite/ndb_memcache/t/basic.test
      mysql-test/suite/ndb_memcache/t/external_values.test
      mysql-test/suite/ndb_memcache/t/lib_ascii.test
      mysql-test/suite/ndb_memcache/t/lib_binary.test
      mysql-test/suite/ndb_memcache/t/math1.test
      mysql-test/suite/ndb_memcache/t/math2.test
      mysql-test/suite/ndb_memcache/t/reconf1.test
      mysql-test/suite/ndb_memcache/t/tsv1.test
      mysql-test/suite/ndb_memcache/t/tsv2.test
      mysql-test/suite/ndb_memcache/t/ttls_flags.test
      mysql-test/suite/ndb_memcache/t/type_char.test
      mysql-test/suite/ndb_memcache/t/type_numeric.test
      mysql-test/suite/ndb_memcache/t/type_signed.test
      mysql-test/suite/ndb_memcache/t/type_unsigned.test
      mysql-test/suite/ndb_memcache/t/unique_idx.test
      mysql-test/suite/ndb_rpl/r/ndb_rpl_ddl_open_trans.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_idempotent.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_sync.result
      mysql-test/suite/ndb_rpl/t/ndb_rpl_idempotent.test
      packaging/WiX/CPackWixConfig.cmake
      packaging/WiX/create_msi.cmake.in
      packaging/WiX/mysql_server.wxs.in
      scripts/mysql_system_tables.sql
      scripts/mysql_system_tables_fix.sql
      sql/abstract_query_plan.cc
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster.h
      sql/ha_ndbcluster_binlog.cc
      sql/ha_ndbcluster_push.cc
      sql/sql_select.cc
      sql/sys_vars.cc
      storage/ndb/CMakeLists.txt
      storage/ndb/VERSION
      storage/ndb/clusterj/clusterj-api/pom.xml
      storage/ndb/clusterj/clusterj-bindings/pom.xml
      storage/ndb/clusterj/clusterj-core/pom.xml
      storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/SessionImpl.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/DomainTypeHandlerImpl.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/spi/DomainTypeHandler.java
      storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/spi/SessionSPI.java
      storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/spi/SmartValueHandler.java
      storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/spi/ValueHandlerFactory.java
      storage/ndb/clusterj/clusterj-jdbc/pom.xml
      storage/ndb/clusterj/clusterj-jpatest/pom.xml
      storage/ndb/clusterj/clusterj-openjpa/pom.xml
      storage/ndb/clusterj/clusterj-openjpa/src/main/java/com/mysql/clusterj/openjpa/NdbOpenJPADomainTypeHandlerImpl.java
      storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/OneToManyRelationshipTest.java
      storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/TestBadPersistenceUnitNoConnectString.java
      storage/ndb/clusterj/clusterj-test/pom.xml
      storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/AbstractClusterJTest.java
      storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/AbstractQueryTest.java
      storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/BitTypesTest.java
      storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DbugTest.java
      storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DeleteAllByClassTest.java
      storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/ObjectNotFoundTest.java
      storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryExplainTest.java
      storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryMultiColumnIndexInTest.java
      storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/SchemaChangeTest.java
      storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/VarcharStringLengthTest.java
      storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/domaintypehandler/CrazyDomainTypeHandlerFactoryImpl.java
      storage/ndb/clusterj/clusterj-tie/logging.properties
      storage/ndb/clusterj/clusterj-tie/pom.xml
      storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/ClusterConnectionImpl.java
      storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/ClusterTransactionImpl.java
      storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/DbImpl.java
      storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordImpl.java
      storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordInsertOperationImpl.java
      storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordKeyOperationImpl.java
      storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordOperationImpl.java
      storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordResultDataImpl.java
      storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordSmartValueHandlerFactoryImpl.java
      storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordSmartValueHandlerImpl.java
      storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/OperationImpl.java
      storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/ResultDataImpl.java
      storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/ScanResultDataImpl.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/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/ConnectionPoolTest.java
      storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/StressTest.java
      storage/ndb/clusterj/pom.xml
      storage/ndb/compile-cluster
      storage/ndb/include/kernel/signaldata/ApiVersion.hpp
      storage/ndb/include/kernel/signaldata/DihScanTab.hpp
      storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp
      storage/ndb/include/kernel/signaldata/FireTrigOrd.hpp
      storage/ndb/include/kernel/signaldata/LqhKey.hpp
      storage/ndb/include/kernel/trigger_definitions.h
      storage/ndb/include/ndb_version.h.in
      storage/ndb/include/util/InputStream.hpp
      storage/ndb/include/util/Vector.hpp
      storage/ndb/memcache/extra/memcached/CMakeLists.txt
      storage/ndb/memcache/extra/memcached/config_tests.in
      storage/ndb/memcache/extra/memcached/daemon/memcached.c
      storage/ndb/memcache/include/NdbInstance.h
      storage/ndb/memcache/include/QueryPlan.h
      storage/ndb/memcache/include/Queue.h
      storage/ndb/memcache/include/Scheduler.h
      storage/ndb/memcache/include/ndb_engine.h
      storage/ndb/memcache/include/ndb_engine_errors.h
      storage/ndb/memcache/include/ndb_pipeline.h
      storage/ndb/memcache/include/ndbmemcache_config.in
      storage/ndb/memcache/scripts/pmpstack.awk
      storage/ndb/memcache/src/ExternalValue.cc
      storage/ndb/memcache/src/NdbInstance.cc
      storage/ndb/memcache/src/Record.cc
      storage/ndb/memcache/src/ndb_configuration.cc
      storage/ndb/memcache/src/ndb_engine.c
      storage/ndb/memcache/src/ndb_engine_errors.cc
      storage/ndb/memcache/src/ndb_engine_private.h
      storage/ndb/memcache/src/ndb_error_logger.cc
      storage/ndb/memcache/src/ndb_pipeline.cc
      storage/ndb/memcache/src/ndb_worker.cc
      storage/ndb/memcache/src/schedulers/S_sched.cc
      storage/ndb/memcache/src/schedulers/S_sched.h
      storage/ndb/memcache/src/schedulers/Stockholm.cc
      storage/ndb/memcache/src/schedulers/Stockholm.h
      storage/ndb/memcache/unit/alloc.cc
      storage/ndb/src/common/debugger/signaldata/ApiVersion.cpp
      storage/ndb/src/common/transporter/Transporter.cpp
      storage/ndb/src/common/util/version.cpp
      storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.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/DbtcMain.cpp
      storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
      storage/ndb/src/kernel/vm/ArrayPool.hpp
      storage/ndb/src/kernel/vm/CMakeLists.txt
      storage/ndb/src/kernel/vm/mt.cpp
      storage/ndb/src/mgmsrv/ConfigInfo.cpp
      storage/ndb/src/mgmsrv/ConfigManager.cpp
      storage/ndb/src/mgmsrv/MgmtSrvr.cpp
      storage/ndb/src/ndbapi/NdbDictionaryImpl.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/NdbQueryOperationImpl.hpp
      storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NDBAPI.java
      storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbIndexScanOperation.java
      storage/ndb/src/ndbjtie/jtie/test/unload/test/MyLoadUnloadTest.java
      storage/ndb/src/ndbjtie/ndbapi_jtie.hpp
      storage/ndb/src/ndbjtie/test/CMakeLists.txt
      storage/ndb/src/ndbjtie/test/ndbjtie_unit_tests-t.alt
      storage/ndb/src/ndbjtie/test/ndbjtie_unit_tests-t.cpp
      storage/ndb/src/ndbjtie/test/test/JTieTestBase.java
      storage/ndb/src/ndbjtie/test/test/NdbJTieMultiLibTest.java
      storage/ndb/src/ndbjtie/test/test_ndbjtie_multilib.cmd.in
      storage/ndb/src/ndbjtie/test/test_ndbjtie_multilib.sh.in
      storage/ndb/src/ndbjtie/test/test_unload_ndbjtie_multilib.cmd.in
      storage/ndb/src/ndbjtie/test/test_unload_ndbjtie_multilib.sh.in
      storage/ndb/test/CMakeLists.txt
      storage/ndb/test/ndbapi/testIndex.cpp
      storage/ndb/test/ndbapi/testMgmd.cpp
      storage/ndb/test/ndbapi/testScan.cpp
      storage/ndb/test/ndbapi/testSpj.cpp
      storage/ndb/test/run-test/conf-blade08.cnf
      storage/ndb/test/run-test/conf-ndb07.cnf
      storage/ndb/test/run-test/conf-tyr13.cnf
      storage/ndb/test/run-test/daily-basic-tests.txt
      storage/ndb/tools/ndb_size.pl
      support-files/compiler_warnings.supp
      support-files/mysql.spec.sh
=== modified file 'mysql-test/suite/ndb/r/ndb_condition_pushdown.result'
--- a/mysql-test/suite/ndb/r/ndb_condition_pushdown.result	2012-03-05 14:02:05 +0000
+++ b/mysql-test/suite/ndb/r/ndb_condition_pushdown.result	2012-05-02 20:15:11 +0000
@@ -2219,8 +2219,8 @@ primary key (`a`,`b`)
 ) engine = ndb;
 explain extended select * from tx join tx as t2 on tx.c=1 where t2.c=1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	tx	ALL	NULL	NULL	NULL	NULL	2	100.00	Using where with pushed condition: (`test`.`tx`.`c` = 1)
-1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	2	100.00	Using where with pushed condition: (`test`.`t2`.`c` = 1); Using join buffer (Block Nested Loop)
+1	SIMPLE	tx	ALL	NULL	NULL	NULL	NULL	2	100.00	Using where with pushed condition (`test`.`tx`.`c` = 1)
+1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	2	100.00	Using where with pushed condition (`test`.`t2`.`c` = 1); Using join buffer (Block Nested Loop)
 Warnings:
 Note	9999	Can't push table 't2' as child, 'type' must be a 'ref' access
 Note	1003	/* select#1 */ select `test`.`tx`.`a` AS `a`,`test`.`tx`.`b` AS `b`,`test`.`tx`.`c` AS `c`,`test`.`tx`.`d` AS `d`,`test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b`,`test`.`t2`.`c` AS `c`,`test`.`t2`.`d` AS `d` from `test`.`tx` join `test`.`tx` `t2` where ((`test`.`tx`.`c` = 1) and (`test`.`t2`.`c` = 1))
@@ -2245,15 +2245,15 @@ where t2.a = 4
 group by t2.c;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t2	ref	PRIMARY	PRIMARY	4	const	2	100.00	Using where; Using filesort
-1	SIMPLE	tx	eq_ref	PRIMARY	PRIMARY	8	test.t2.c,test.t2.d	1	100.00	
+1	SIMPLE	tx	eq_ref	PRIMARY	PRIMARY	8	test.t2.c,test.t2.d	1	100.00	NULL
 Warnings:
 Note	9999	Table 't2' is not pushable: GROUP BY cannot be done using index on grouped columns.
 Note	9999	Table 'tx' is not pushable: GROUP BY cannot be done using index on grouped columns.
 Note	1003	/* select#1 */ select `test`.`t2`.`c` AS `c`,count(distinct `test`.`t2`.`a`) AS `count(distinct t2.a)` from `test`.`tx` join `test`.`tx` `t2` where ((`test`.`tx`.`b` = `test`.`t2`.`d`) and (`test`.`tx`.`a` = `test`.`t2`.`c`) and (`test`.`t2`.`a` = 4)) group by `test`.`t2`.`c`
 explain extended select * from tx join tx as t2 on tx.c=1 where t2.c=1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	tx	ALL	NULL	NULL	NULL	NULL	2	100.00	Using where with pushed condition: (`test`.`tx`.`c` = 1)
-1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	2	100.00	Using where with pushed condition: (`test`.`t2`.`c` = 1); Using join buffer (Block Nested Loop)
+1	SIMPLE	tx	ALL	NULL	NULL	NULL	NULL	2	100.00	Using where with pushed condition (`test`.`tx`.`c` = 1)
+1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	2	100.00	Using where with pushed condition (`test`.`t2`.`c` = 1); Using join buffer (Block Nested Loop)
 Warnings:
 Note	9999	Can't push table 't2' as child, 'type' must be a 'ref' access
 Note	1003	/* select#1 */ select `test`.`tx`.`a` AS `a`,`test`.`tx`.`b` AS `b`,`test`.`tx`.`c` AS `c`,`test`.`tx`.`d` AS `d`,`test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b`,`test`.`t2`.`c` AS `c`,`test`.`t2`.`d` AS `d` from `test`.`tx` join `test`.`tx` `t2` where ((`test`.`tx`.`c` = 1) and (`test`.`t2`.`c` = 1))
@@ -2265,7 +2265,7 @@ where t2.a = 4
 group by t2.c;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t2	ref	PRIMARY	PRIMARY	4	const	2	100.00	Using where; Using filesort
-1	SIMPLE	tx	eq_ref	PRIMARY	PRIMARY	8	test.t2.c,test.t2.d	1	100.00	
+1	SIMPLE	tx	eq_ref	PRIMARY	PRIMARY	8	test.t2.c,test.t2.d	1	100.00	NULL
 Warnings:
 Note	9999	Table 't2' is not pushable: GROUP BY cannot be done using index on grouped columns.
 Note	9999	Table 'tx' is not pushable: GROUP BY cannot be done using index on grouped columns.
@@ -2281,7 +2281,7 @@ select * from t where exists
 (select * from t as subq where subq.i=3 and t.i=3);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	t	ALL	NULL	NULL	NULL	NULL	4	100.00	Using where
-2	DEPENDENT SUBQUERY	subq	ALL	NULL	NULL	NULL	NULL	4	100.00	Using where with pushed condition: (`test`.`subq`.`i` = 3)
+2	DEPENDENT SUBQUERY	subq	ALL	NULL	NULL	NULL	NULL	4	100.00	Using where with pushed condition (`test`.`subq`.`i` = 3)
 Warnings:
 Note	1276	Field or reference 'test.t.i' of SELECT #2 was resolved in SELECT #1
 Note	1003	/* select#1 */ select `test`.`t`.`pk` AS `pk`,`test`.`t`.`i` AS `i` from `test`.`t` where exists(/* select#2 */ select 1 from `test`.`t` `subq` where ((`test`.`subq`.`i` = 3) and (`test`.`t`.`i` = 3)))
@@ -2290,7 +2290,7 @@ select * from t where exists
 (select * from subq where subq.i=3 and t.i=3);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	t	ALL	NULL	NULL	NULL	NULL	4	100.00	Using where
-2	DEPENDENT SUBQUERY	subq	ALL	NULL	NULL	NULL	NULL	4	100.00	Using where with pushed condition: (`test`.`subq`.`i` = 3)
+2	DEPENDENT SUBQUERY	subq	ALL	NULL	NULL	NULL	NULL	4	100.00	Using where with pushed condition (`test`.`subq`.`i` = 3)
 Warnings:
 Note	1276	Field or reference 'test.t.i' of SELECT #2 was resolved in SELECT #1
 Note	1003	/* select#1 */ select `test`.`t`.`pk` AS `pk`,`test`.`t`.`i` AS `i` from `test`.`t` where exists(/* select#2 */ select 1 from `test`.`subq` where ((`test`.`subq`.`i` = 3) and (`test`.`t`.`i` = 3)))

=== modified file 'mysql-test/suite/ndb_binlog/r/ndb_binlog_index.result'
--- a/mysql-test/suite/ndb_binlog/r/ndb_binlog_index.result	2012-03-28 15:17:32 +0000
+++ b/mysql-test/suite/ndb_binlog/r/ndb_binlog_index.result	2012-05-02 19:21:18 +0000
@@ -221,8 +221,7 @@ Quick test of ndb-log-empty-epochs = 1
 --------------------------------------
 select * from mysql.ndb_binlog_index order by epoch;
 Position	File	epoch	inserts	updates	deletes	schemaops	orig_server_id	orig_epoch	gci	next_position	next_file
-show binlog events from <binlog_start>;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+include/show_binlog_events.inc
 show variables like 'ndb_log_empty_epochs';
 Variable_name	Value
 ndb_log_empty_epochs	OFF
@@ -249,7 +248,6 @@ bi1.Position != bi2.Position OR
 bi1.File != bi2.File;
 epoch	Position	File	next_position	next_file	epoch	Position	File	next_position	next_file
 Show that we have no epochs in the Binlog
-show binlog events from <binlog_start>;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+include/show_binlog_events.inc
 Disable
 set global ndb_log_empty_epochs=0;

=== modified file 'sql/ha_ndbcluster_cond.cc'
--- a/sql/ha_ndbcluster_cond.cc	2012-03-05 14:02:05 +0000
+++ b/sql/ha_ndbcluster_cond.cc	2012-05-02 20:15:11 +0000
@@ -279,10 +279,12 @@ ndb_serialize_cond(const Item *item, voi
                 (context->expecting_field_result(field->result_type()) ||
                  // Date and year can be written as string or int
                  ((type == MYSQL_TYPE_TIME ||
+                   type == MYSQL_TYPE_TIME2 ||
                    type == MYSQL_TYPE_DATE || 
                    type == MYSQL_TYPE_NEWDATE || 
                    type == MYSQL_TYPE_YEAR ||
-                   type == MYSQL_TYPE_DATETIME)
+                   type == MYSQL_TYPE_DATETIME ||
+                   type == MYSQL_TYPE_DATETIME2)
                   ? (context->expecting_field_result(STRING_RESULT) ||
                      context->expecting_field_result(INT_RESULT))
                   : TRUE)) &&
@@ -303,10 +305,12 @@ ndb_serialize_cond(const Item *item, voi
               {
                 // We have not seen second argument yet
                 if (type == MYSQL_TYPE_TIME ||
+                    type == MYSQL_TYPE_TIME2 ||
                     type == MYSQL_TYPE_DATE || 
                     type == MYSQL_TYPE_NEWDATE || 
                     type == MYSQL_TYPE_YEAR ||
-                    type == MYSQL_TYPE_DATETIME)
+                    type == MYSQL_TYPE_DATETIME ||
+                    type == MYSQL_TYPE_DATETIME2)
                 {
                   context->expect_only(Item::STRING_ITEM);
                   context->expect(Item::INT_ITEM);
@@ -347,10 +351,12 @@ ndb_serialize_cond(const Item *item, voi
                 if ((field->result_type() == STRING_RESULT) &&
                     !context->expecting_collation(item->collation.collation)
                     && type != MYSQL_TYPE_TIME
+                    && type != MYSQL_TYPE_TIME2
                     && type != MYSQL_TYPE_DATE
                     && type != MYSQL_TYPE_NEWDATE
                     && type != MYSQL_TYPE_YEAR
-                    && type != MYSQL_TYPE_DATETIME)
+                    && type != MYSQL_TYPE_DATETIME
+                    && type != MYSQL_TYPE_DATETIME2)
                 {
                   DBUG_PRINT("info", ("Found non-matching collation %s",  
                                       item->collation.collation->name)); 

=== modified file 'storage/ndb/compile-cluster'
--- a/storage/ndb/compile-cluster	2012-05-02 19:09:22 +0000
+++ b/storage/ndb/compile-cluster	2012-05-02 20:12:44 +0000
@@ -73,6 +73,20 @@ my $cmake_version_id;
   die "Could not parse cmake version" unless ($cmake_version_id);
 }
 
+# Replace gcc with g++ in CXX environment variable
+if(defined $ENV{"CXX"} and $ENV{"CXX"} =~ m/gcc/)
+{
+  my $old_cxx= $ENV{"CXX"};
+  $ENV{"CXX"} =~ s/gcc/g++/;
+  print("compile-cluster: switched CXX compiler from '$old_cxx' to '$ENV{CXX}'\n");
+}
+
+# Remove -fno-exceptions from CXXFLAGS environment variable
+if(defined $ENV{"CXXFLAGS"} and $ENV{"CXXFLAGS"} =~ "-fno-exceptions")
+{
+  $ENV{"CXXFLAGS"} =~ s/-fno-exceptions//g;
+  print("compile-cluster: stripped off -fno-exceptions from CXXFLAGS='$ENV{CXXFLAGS}'\n");
+}
 
 #
 # Configure

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk-cluster branch (magnus.blaudd:3487 to 3490) WL#6224magnus.blaudd3 May