List:Commits« Previous MessageNext Message »
From:MySQL Release Engineering Date:September 5 2012 9:40am
Subject:bzr push into mysql-5.5-cluster-7.2 branch (mysql-re_ww:3873 to 3964)
View as plain text  
 3964 magnus.blaudd@stripped	2012-07-05 {clone-mysql-5.5.25a-ndb-7.2.7-src-build} [merge]
      Merge 7.1 -> 7.2

    added:
      storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/TableWithoutPKTest.java
      storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/TableWithoutPKTest.java
    modified:
      mysql-test/suite/ndb/t/clusterj.test
      storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/metadata/DomainTypeHandlerImpl.java
      storage/ndb/clusterj/clusterj-core/src/main/resources/com/mysql/clusterj/core/Bundle.properties
      storage/ndb/clusterj/clusterj-test/src/main/resources/schema.sql
 3963 magnus.blaudd@stripped	2012-07-05
      ndb
       - remove trailing 'a' from MYSQL_SERVER_VERSION used to mask output from
         ndb_mgm, ndb_mgm doesn't print it
       - change to use the new "ndb_version_string" variable for the
         ndb_version mask

    modified:
      mysql-test/suite/ndb/t/ndb_mgm.test
 3962 magnus.blaudd@stripped	2012-07-05
      mtr
       - fix detection of MySQL Cluster to not require the extra version string to
       start with ndb-, instead add check that it contains the ndb-Y.Y.Y pattern

    modified:
      mysql-test/mysql-test-run.pl
 3961 magnus.blaudd@stripped	2012-07-05
      Merge in patch for Bug#13059933 - again

    modified:
      mysql-test/t/mysql_plugin.test
 3960 magnus.blaudd@stripped	2012-07-05 [merge]
      Merge 5.5.25a into 7.2

    modified:
      VERSION
      mysql-test/lib/My/Find.pm
      mysql-test/lib/mtr_cases.pm
      mysql-test/suite/sys_vars/t/disabled.def
      mysql-test/t/mysql_plugin.test
      sql/sql_update.cc
 3959 Ole John Aske	2012-07-04
      This is a small SPJ refactoring patch which is required in preparation for fixing:
      
        - Bug 14143553 JOB BUFFER FULL - DATA NODE CRASH (Blizzard)
        - Bug 13799800 NDBMTD CRASHES DURING SONY-QUERY WITH 128 PARTITIONS ON 4 NODES WITH 4 LDM EACH
      
      Patch clean up the allocation of fragments list in Dbspj::execDIH_SCAN_TAB_CONF
      such that:
      
      - The fragment list is allocated in a *single place*, instead of two places
      - Scope of 'list(... , data.m:fragment) is made local within the
         code stub which require it.
         (Required by abort/error handling to be added later, as the list has to
         go out of scope, before it can be referred elsewhere)

    modified:
      storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp
 3958 Ole John Aske	2012-07-04 [merge]
      Merged various 'SPJ resource leakage fixes' from 7.2-spj -> mysql-5.5-cluster.

    modified:
      storage/ndb/src/kernel/blocks/dbspj/Dbspj.hpp
      storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp
      storage/ndb/src/ndbapi/ndberror.c
      storage/ndb/test/include/HugoQueries.hpp
      storage/ndb/test/ndbapi/testSpj.cpp
      storage/ndb/test/src/HugoQueries.cpp
      storage/ndb/test/tools/hugoJoin.cpp
 3957 John David Duncan	2012-06-27 [merge]
      local merge

    modified:
      mysql-test/suite/ndb_memcache/r/ttls_flags.result
      storage/ndb/memcache/unit/extvals.pl
 3956 John David Duncan	2012-06-27 [merge]
      local merge

    modified:
      storage/ndb/memcache/src/ExternalValue.cc
      storage/ndb/memcache/src/ndb_worker.cc
 3955 magnus.blaudd@stripped	2012-06-27 [merge]
      Merge 7.1 -> 7.2

    modified:
      mysql-test/suite/ndb/t/ndb_reconnect.test
 3954 magnus.blaudd@stripped	2012-06-27 [merge]
      Merge 7.1 -> 7.2

    modified:
      sql/ha_ndbcluster_binlog.cc
 3953 magnus.blaudd@stripped	2012-06-26 [merge]
      Merge 7.1 -> 7.2

    added:
      mysql-test/suite/ndb/r/ndb_mgmd.result
      mysql-test/suite/ndb/t/ndb_mgmd.cnf
      mysql-test/suite/ndb/t/ndb_mgmd.test
    modified:
      storage/ndb/include/logger/FileLogHandler.hpp
      storage/ndb/include/logger/LogHandler.hpp
      storage/ndb/include/logger/Logger.hpp
      storage/ndb/src/common/logger/LogHandler.cpp
      storage/ndb/src/common/logger/Logger.cpp
      storage/ndb/src/mgmsrv/MgmtSrvr.cpp
      storage/ndb/src/mgmsrv/MgmtSrvr.hpp
      storage/ndb/tools/ndb_error_reporter
 3952 Jan Wedvik	2012-06-26 [merge]
      Merge 7.1->7.2

    modified:
      storage/ndb/test/ndbapi/testScan.cpp
 3951 Jan Wedvik	2012-06-26 [merge]
      Merge 7.1 -> 7.2

    modified:
      storage/ndb/src/ndbapi/NdbScanOperation.cpp
      storage/ndb/src/ndbapi/ndberror.c
      storage/ndb/test/ndbapi/testScan.cpp
      storage/ndb/test/run-test/daily-basic-tests.txt
 3950 magnus.blaudd@stripped	2012-06-25 [merge]
      Merge 7.1 -> 7.2

    modified:
      storage/ndb/test/include/NdbBackup.hpp
      storage/ndb/test/include/NdbConfig.hpp
      storage/ndb/test/ndbapi/testBackup.cpp
      storage/ndb/test/ndbapi/testBasic.cpp
      storage/ndb/test/ndbapi/testSystemRestart.cpp
      storage/ndb/test/ndbapi/testTimeout.cpp
      storage/ndb/test/ndbapi/testUpgrade.cpp
 3949 Jan Wedvik	2012-06-25 [merge]
      Merge 7.1 -> 7.2

    modified:
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
      storage/ndb/test/ndbapi/testBasic.cpp
      storage/ndb/test/run-test/daily-basic-tests.txt
 3948 Bernd Ocklin	2012-06-25
      add missing ndb_blob_tool to rpm spec

    modified:
      support-files/mysql.spec.sh
 3947 Mauritz Sundell	2012-06-21 [merge]
      ndb - Merge 7.1 -> 7.2

    modified:
      storage/ndb/include/kernel/ndb_limits.h
      storage/ndb/include/kernel/signaldata/CreateTable.hpp
      storage/ndb/include/kernel/signaldata/DictTabInfo.hpp
      storage/ndb/include/kernel/signaldata/ScanTab.hpp
      storage/ndb/include/ndb_version.h.in
      storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
      storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
      storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
      storage/ndb/src/kernel/blocks/ndbfs/AsyncIoThread.hpp
      storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp
      storage/ndb/src/kernel/blocks/suma/Suma.hpp
      storage/ndb/src/kernel/vm/SimulatedBlock.hpp
      storage/ndb/src/ndbapi/NdbDictionary.cpp
      storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
      storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp
      storage/ndb/src/ndbapi/NdbQueryOperation.cpp
      storage/ndb/src/ndbapi/NdbScanOperation.cpp
 3946 Bernd Ocklin	2012-06-21
      fix rpm spec file: add missing new man page

    modified:
      support-files/mysql.spec.sh
 3945 Martin Skold	2012-06-21 [merge]
      Merge from 7.1

 3944 Martin Skold	2012-06-21 [merge]
      Merge from 7.1

    modified:
      mysql-test/suite/ndb/r/ndb_alter_table_online.result
      mysql-test/suite/ndb/t/ndb_alter_table_online.test
      sql/sql_table.cc
 3943 Ole John Aske	2012-06-20
      Increase MaxNoOfConcurrentOperations in 'suite/ndb_big/my.cnf' in order to reduce
      failure rates for 'ndb_big.rqg_spj' which repeateadly encounters:
      
      'Got temporary error 233 'Out of operation records in transaction coordinator (increase MaxNoOfConcurrentOperations)'
      
      ... Jonas has previously suggested to increase this in config file.

    modified:
      mysql-test/suite/ndb_big/my.cnf
 3942 Ole John Aske	2012-06-18
      Follow up fix to Mikael R's 4G, savemem.patch:
      
      We originally assumed that a specific TC did not communicate with other TCs.
      However, the SPJ block is located in the same block-thread as the TCs.
      
      TC *will* communicate with all SPJ blocks, which should be counted as
      a full TC <-> TC cross communication.

    modified:
      storage/ndb/src/kernel/vm/mt.cpp
 3941 Martin Skold	2012-06-15 [merge]
      Merge from 7.1

    modified:
      mysql-test/suite/ndb/r/ndb_index_stat_restart.result
      mysql-test/suite/ndb/t/ndb_reconnect.test
 3940 Martin Skold	2012-06-15 [merge]
      Merge from 7.1

    modified:
      mysql-test/suite/ndb/r/ndb_reconnect.result
      mysql-test/suite/ndb/t/ndb_reconnect.test
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster_binlog.cc
      sql/ndb_thd_ndb.h
      sql/sql_show.cc
      sql/sql_show.h
 3939 magnus.blaudd@stripped	2012-06-13 [merge]
      Merge 7.1 -> 7.2

    renamed:
      mysql-test/include/rpl_multi_engine2.inc => mysql-test/suite/ndb_rpl/t/ndb_rpl_multi_engine2.inc
    modified:
      mysql-test/suite/ndb/r/ndb_alter_table_online.result
      mysql-test/suite/ndb/r/ndb_basic.result
      mysql-test/suite/ndb/t/ndb_alter_table_online.test
      mysql-test/suite/ndb_rpl/r/ndb_rpl_dd_advance.result
      mysql-test/suite/ndb_rpl/t/ndb_rpl_2multi_basic.inc
      mysql-test/suite/ndb_rpl/t/ndb_rpl_dd_advance.test
      sql/ha_ndbcluster.cc
      storage/ndb/include/ndb_version.h.in
      storage/ndb/include/ndbapi/NdbScanOperation.hpp
      storage/ndb/src/common/util/version.cpp
 3938 magnus.blaudd@stripped	2012-06-13 [merge]
      Merge

    modified:
      config.h.cmake
      mysql-test/suite/ndb/r/ndb_condition_pushdown.result
      mysql-test/suite/ndb/r/ndb_gis.result
      mysql-test/suite/ndb/r/ndb_join_pushdown_default.result
      sql/ha_ndbcluster_push.cc
 3937 John David Duncan	2012-06-13
      bug#14192154 -- the file:
         META-INF/services/org.apache.openjpa.lib.conf.ProductDerivation 
      was missing from the clusterjpa.jar file.

    modified:
      storage/ndb/clusterj/clusterj-openjpa/CMakeLists.txt
 3936 Mauritz Sundell	2012-06-11 [merge]
      Merge 7.1->7.2

    modified:
      storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryOrderingTest.java
      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-unit/src/main/java/junit/framework/TestCase.java
      storage/ndb/include/ndb_config.h.in
      storage/ndb/include/ndbapi/Ndb.hpp
      storage/ndb/include/portlib/NdbSleep.h
      storage/ndb/include/transporter/TransporterRegistry.hpp
      storage/ndb/ndb_configure.cmake
      storage/ndb/src/common/transporter/TCP_Transporter.cpp
      storage/ndb/src/common/transporter/Transporter.cpp
      storage/ndb/src/common/transporter/Transporter.hpp
      storage/ndb/src/common/util/HashMap2.cpp
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
      storage/ndb/src/ndbapi/Ndb.cpp
      storage/ndb/src/ndbapi/Ndbinit.cpp
      storage/ndb/src/ndbapi/Ndblist.cpp
      storage/ndb/test/ndbapi/flexAsynch.cpp
 3935 Martin Skold	2012-06-08
      Merge missmatch in result file, regenerated

    modified:
      mysql-test/suite/rpl/r/rpl_stm_relay_ign_space.result
 3934 Martin Skold	2012-06-08 [merge]
      Merge from 7.1

    added:
      storage/ndb/tools/ndb_blob_tool.cpp
    modified:
      mysql-test/suite/rpl/r/rpl_stm_relay_ign_space.result
      storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/QueryDomainTypeImpl.java
      storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordScanOperationImpl.java
      storage/ndb/tools/CMakeLists.txt
 3933 Martin Skold	2012-06-07
      Regenerated result

    modified:
      mysql-test/suite/innodb/r/innodb_bug12902967.result
 3932 Martin Skold	2012-06-07
      Incorrect merge

    modified:
      sql/sql_table.cc
 3931 Martin Skold	2012-06-07
      Ndb doesn't provide identical transactions on the slave

    modified:
      mysql-test/extra/rpl_tests/rpl_row_basic.test
 3930 Martin Skold	2012-06-07 [merge]
      Merge from mysql-5.5.25

    removed:
      mysql-test/suite/innodb/include/innodb-index.inc
      mysql-test/t/cache_innodb-master.opt
    added:
      mysql-test/include/show_slave_hosts.inc
      mysql-test/r/blackhole.result
      mysql-test/r/bug12427262.result
      mysql-test/r/partition_cache.result
      mysql-test/suite/innodb/r/innodb_bug11766634.result
      mysql-test/suite/innodb/r/innodb_bug12902967.result
      mysql-test/suite/innodb/r/innodb_bug13635833.result
      mysql-test/suite/innodb/r/innodb_bug14007649.result
      mysql-test/suite/innodb/t/innodb_bug11766634-master.opt
      mysql-test/suite/innodb/t/innodb_bug11766634.test
      mysql-test/suite/innodb/t/innodb_bug12902967.test
      mysql-test/suite/innodb/t/innodb_bug13635833.test
      mysql-test/suite/innodb/t/innodb_bug14007649.test
      mysql-test/suite/rpl/r/rpl_auto_increment_bug45679.result
      mysql-test/suite/rpl/r/rpl_parallel_show_binlog_events_purge_logs.result
      mysql-test/suite/rpl/r/rpl_report_port.result
      mysql-test/suite/rpl/r/rpl_row_merge_engine.result
      mysql-test/suite/rpl/r/rpl_stm_relay_ign_space.result
      mysql-test/suite/rpl/t/rpl_auto_increment_bug45679.test
      mysql-test/suite/rpl/t/rpl_parallel_show_binlog_events_purge_logs.test
      mysql-test/suite/rpl/t/rpl_report_port-master.opt
      mysql-test/suite/rpl/t/rpl_report_port.test
      mysql-test/suite/rpl/t/rpl_row_merge_engine.test
      mysql-test/suite/rpl/t/rpl_stm_relay_ign_space-slave.opt
      mysql-test/suite/rpl/t/rpl_stm_relay_ign_space.test
      mysql-test/t/blackhole.test
      mysql-test/t/bug12427262.test
      mysql-test/t/partition_cache.test
      sql/mem_root_array.h
    modified:
      VERSION
      client/mysqldump.c
      client/mysqlslap.c
      configure.cmake
      include/my_base.h
      include/violite.h
      libmysqld/lib_sql.cc
      mysql-test/extra/rpl_tests/rpl_row_basic.test
      mysql-test/include/query_cache.inc
      mysql-test/mysql-test-run.pl
      mysql-test/r/alter_table.result
      mysql-test/r/cache_innodb.result
      mysql-test/r/cast.result
      mysql-test/r/ctype_ucs.result
      mysql-test/r/errors.result
      mysql-test/r/filesort_debug.result
      mysql-test/r/func_in.result
      mysql-test/r/gis.result
      mysql-test/r/help.result
      mysql-test/r/mysqld--help-notwin.result
      mysql-test/r/mysqld--help-win.result
      mysql-test/r/mysqldump.result
      mysql-test/r/mysqlslap.result
      mysql-test/r/partition_innodb.result
      mysql-test/r/partition_pruning.result
      mysql-test/r/ps.result
      mysql-test/r/select.result
      mysql-test/r/sp-bugs.result
      mysql-test/r/sp-code.result
      mysql-test/r/sp.result
      mysql-test/r/sp_notembedded.result
      mysql-test/r/sql_mode.result
      mysql-test/r/subselect.result
      mysql-test/r/subselect_innodb.result
      mysql-test/r/user_var.result
      mysql-test/r/view.result
      mysql-test/r/xa.result
      mysql-test/suite/binlog/r/binlog_grant.result
      mysql-test/suite/binlog/r/binlog_sql_mode.result
      mysql-test/suite/binlog/r/binlog_unsafe.result
      mysql-test/suite/binlog/t/binlog_grant.test
      mysql-test/suite/binlog/t/binlog_sql_mode.test
      mysql-test/suite/binlog/t/binlog_unsafe.test
      mysql-test/suite/innodb/r/innodb-autoinc.result
      mysql-test/suite/innodb/t/innodb-autoinc.test
      mysql-test/suite/innodb/t/innodb_bug34300.test
      mysql-test/suite/rpl/r/rpl_filter_tables_not_exist.result
      mysql-test/suite/rpl/r/rpl_known_bugs_detection.result
      mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result
      mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result
      mysql-test/suite/rpl/r/rpl_row_basic_allow_batching.result
      mysql-test/suite/rpl/r/rpl_show_slave_hosts.result
      mysql-test/suite/rpl/t/rpl_filter_tables_not_exist.test
      mysql-test/suite/rpl/t/rpl_show_slave_hosts.test
      mysql-test/suite/sys_vars/t/report_port_basic.test
      mysql-test/t/alter_table.test
      mysql-test/t/cast.test
      mysql-test/t/ctype_ucs.test
      mysql-test/t/errors.test
      mysql-test/t/filesort_debug.test
      mysql-test/t/func_in.test
      mysql-test/t/gis.test
      mysql-test/t/help.test
      mysql-test/t/mysqldump.test
      mysql-test/t/mysqlslap.test
      mysql-test/t/partition_innodb.test
      mysql-test/t/ps.test
      mysql-test/t/select.test
      mysql-test/t/sp-bugs.test
      mysql-test/t/sp-code.test
      mysql-test/t/sp.test
      mysql-test/t/sp_notembedded.test
      mysql-test/t/sql_mode.test
      mysql-test/t/subselect.test
      mysql-test/t/subselect_innodb.test
      mysql-test/t/user_var.test
      mysql-test/t/view.test
      mysql-test/t/xa.test
      mysys/lf_alloc-pin.c
      mysys/my_handler_errors.h
      mysys/stacktrace.c
      sql/field.cc
      sql/field.h
      sql/field_conv.cc
      sql/filesort.cc
      sql/ha_ndbcluster.cc
      sql/ha_partition.cc
      sql/ha_partition.h
      sql/handler.cc
      sql/handler.h
      sql/item.cc
      sql/item.h
      sql/item_cmpfunc.h
      sql/item_subselect.cc
      sql/item_timefunc.cc
      sql/log.cc
      sql/log.h
      sql/log_event.cc
      sql/log_event.h
      sql/log_event_old.cc
      sql/mysqld.cc
      sql/password.c
      sql/rpl_rli.cc
      sql/rpl_rli.h
      sql/rpl_utility.cc
      sql/rpl_utility.h
      sql/share/errmsg-utf8.txt
      sql/signal_handler.cc
      sql/slave.cc
      sql/sp_head.cc
      sql/spatial.cc
      sql/sql_base.cc
      sql/sql_class.cc
      sql/sql_class.h
      sql/sql_lex.cc
      sql/sql_lex.h
      sql/sql_parse.cc
      sql/sql_prepare.cc
      sql/sql_repl.cc
      sql/sql_select.cc
      sql/sql_show.cc
      sql/sql_table.cc
      sql/sql_view.cc
      sql/sys_vars.cc
      sql/table.cc
      sql/transaction.cc
      storage/blackhole/ha_blackhole.cc
      storage/example/ha_example.cc
      storage/innobase/btr/btr0btr.c
      storage/innobase/btr/btr0cur.c
      storage/innobase/btr/btr0pcur.c
      storage/innobase/buf/buf0buf.c
      storage/innobase/buf/buf0flu.c
      storage/innobase/buf/buf0lru.c
      storage/innobase/dict/dict0dict.c
      storage/innobase/dict/dict0load.c
      storage/innobase/fil/fil0fil.c
      storage/innobase/fsp/fsp0fsp.c
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/handler/ha_innodb.h
      storage/innobase/handler/handler0alter.cc
      storage/innobase/ibuf/ibuf0ibuf.c
      storage/innobase/include/btr0btr.h
      storage/innobase/include/buf0buf.h
      storage/innobase/include/buf0lru.h
      storage/innobase/include/buf0types.h
      storage/innobase/include/db0err.h
      storage/innobase/include/dict0dict.h
      storage/innobase/include/dict0dict.ic
      storage/innobase/include/dict0mem.h
      storage/innobase/include/fil0fil.h
      storage/innobase/include/mtr0mtr.ic
      storage/innobase/include/srv0srv.h
      storage/innobase/include/sync0rw.h
      storage/innobase/include/sync0rw.ic
      storage/innobase/include/trx0purge.h
      storage/innobase/include/univ.i
      storage/innobase/lock/lock0lock.c
      storage/innobase/log/log0log.c
      storage/innobase/row/row0ins.c
      storage/innobase/row/row0merge.c
      storage/innobase/row/row0mysql.c
      storage/innobase/row/row0row.c
      storage/innobase/srv/srv0srv.c
      storage/innobase/srv/srv0start.c
      storage/innobase/sync/sync0arr.c
      storage/innobase/trx/trx0purge.c
      storage/innobase/ut/ut0ut.c
      storage/myisam/ha_myisam.cc
      storage/myisam/mi_dynrec.c
      storage/perfschema/pfs_instr.cc
      vio/viosocket.c
 3929 Frazer Clement	2012-05-31
      Bug#14083116 (Bad error handling in LQH corrupts transid hash)
      
      Testcase verifying fix.

    modified:
      mysql-test/suite/ndb/r/ndb_join_pushdown_default.result
      mysql-test/suite/ndb/t/ndb_join_pushdown.inc
 3928 Frazer Clement	2012-05-31 [merge]
      Merge 7.1-7.2

    added:
      storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryOrderingTest.java
      storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryOrderingTest.java
    modified:
      storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/Query.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/InPredicateImpl.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/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/query/QueryImpl.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/src/main/java/com/mysql/clusterj/jdbc/SQLExecutor.java
      storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/AbstractQueryTest.java
      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/ScanOperationImpl.java
      storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
 3927 Frazer Clement	2012-05-29 [merge]
      Merge 7.1->7.2

    added:
      storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryLimitsTest.java
      storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryLimitsTest.java
    modified:
      storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/Query.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/query/QueryImpl.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/src/main/java/com/mysql/clusterj/jdbc/SQLExecutor.java
      storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/AbstractQueryTest.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/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/ScanOperationImpl.java
      storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/ScanResultDataImpl.java
      storage/ndb/include/mgmapi/ndbd_exit_codes.h
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
      storage/ndb/src/kernel/error/ndbd_exit_codes.c
 3926 magnus.blaudd@stripped	2012-05-23 [merge]
      Merge 7.1 -> 7.2
      Fixed the other place in ha_ndbcluster_cond for BUG#14106592

    modified:
      mysql-test/suite/ndb/r/ndb_condition_pushdown.result
      mysql-test/suite/ndb/t/ndb_condition_pushdown.test
      sql/ha_ndbcluster_cond.cc
      storage/ndb/src/common/util/SocketClient.cpp
 3925 Bernd Ocklin	2012-05-23
      fix obsoletes to allow mysql dependend products to be installed with mysql cluster server

    modified:
      support-files/mysql.spec.sh
 3924 Bernd Ocklin	2012-05-23
      add missing man files to rpm spec

    modified:
      support-files/mysql.spec.sh
 3923 Ole John Aske	2012-05-23
      This is the improved 'save_mem.patch' from Mikael R. patch set :
      
      'Patches used in benchmark tree with Intel'
      
      The patch will reduce memory footprint by not allocating
      job_buffers (Used to communicate between the block-threads 
      within a ndbmtd instance) for those block-threads which 
      are not allowed to communicate with each other.

    modified:
      storage/ndb/src/kernel/vm/mt.cpp
 3922 Ole John Aske	2012-05-22
      This is the 'various.patch' being part of Mikael R patch set:
      
      'Patches used in benchmark tree with Intel'

    modified:
      storage/ndb/src/kernel/vm/mt.cpp
 3921 Frazer Clement	2012-05-22 [merge]
      Merge 7.1->7.2

    modified:
      storage/ndb/include/kernel/GlobalSignalNumbers.h
      storage/ndb/include/kernel/signaldata/LCP.hpp
      storage/ndb/include/kernel/signaldata/SignalData.hpp
      storage/ndb/src/common/debugger/signaldata/LCP.cpp
      storage/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp
      storage/ndb/src/common/debugger/signaldata/SignalNames.cpp
      storage/ndb/src/kernel/blocks/backup/Backup.cpp
      storage/ndb/src/kernel/blocks/backup/Backup.hpp
      storage/ndb/src/kernel/blocks/backup/BackupInit.cpp
      storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
      storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
      storage/ndb/test/include/NdbMgmd.hpp
      storage/ndb/test/ndbapi/testNodeRestart.cpp
      storage/ndb/test/run-test/daily-devel-tests.txt
 3920 Martin Zaun	2012-05-16 [merge]
      merge 71 to 72

    modified:
      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/NdbRecordIndexScanOperationImpl.java
      storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbInterpretedCode.java
      storage/ndb/src/ndbjtie/ndbapi_jtie.hpp
 3919 magnus.blaudd@stripped	2012-05-11
      BUG#14058643 SVR4 PACKAGES OF CLUSTER MAY GROW ABOVE 2GB LIMIT AND FAIL TO
      BUILD
       - Add MCP patch for problem with too big SVR4 packages

    modified:
      libmysqld/examples/CMakeLists.txt
 3918 magnus.blaudd@stripped	2012-05-10
      ndb
       - remove mystery removal of IF(WITH_NDB_TEST) from CMakeLists.txt

    modified:
      storage/ndb/test/CMakeLists.txt
 3917 Ole John Aske	2012-05-08
      Another followup of changes introduced by revno 3913 :-(
      
      That change had the side effect that it turned on mysql DBUG logging for
      the entire ndb_join_pushdown.test - Which was really huge.
      
      With this fix the 'debug' variable is reset to initial saved value
      when the 'max_NNrows_in_spj_batches' is no longer required.

    modified:
      mysql-test/suite/ndb/r/ndb_join_pushdown_default.result
      mysql-test/suite/ndb/t/ndb_join_pushdown.inc
 3916 magnus.blaudd@stripped	2012-05-08
      BUG#14010507 NDBSCANFILTER CLASS MISSING IN LIBNDBCLIENT.SO.6.0.0
       - Add reference to NdbScanFilter to dummy.cpp

    modified:
      storage/ndb/src/dummy.cpp
 3915 Ole John Aske	2012-05-08
      Fix for Bug#14010406 LARGE PUSHED JOIN HIT ASSERT IN SPJ BLOCK
      
      Buffered rows (caused by PARENT refs) was prematurely
      released when there was no TN_ACTIVE treeNodes childs.
      
      However, in bushy scans, a scan branch can be 'repeated'
      even if its previous execution was not 'ACTIVE'
      
      Thus, the logic for when buffered row should be released should be
      less eager to release rows. Now we keep any buffered rows until
      we prepare the treeNodes to retrieve new rows for the specific treeNode.
      
      This also made it possible to simplify this logic such that the
      recursive method Dbspj::cleanupChildBranch() became obsolete.
      
      As part of debugging / fixing this problem, SPJ-DEBUG trace was
      enhanced such that execution of SPJ signals are related
      to 'node_no' of treeNode and ident of the request it belongs to.

    modified:
      mysql-test/suite/ndb/r/ndb_join_pushdown_default.result
      mysql-test/suite/ndb/t/ndb_join_pushdown.inc
      storage/ndb/src/kernel/blocks/dbspj/Dbspj.hpp
      storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp
      storage/ndb/src/ndbapi/NdbQueryBuilder.cpp
 3914 Ole John Aske	2012-05-08
      Fix for MTR test breaks caused by revno 3913.
      
      Let MTR test ignore possible Error 1193 caused by setting the
      'debug' variable if running a non-debug version of the code.
       

    modified:
      mysql-test/suite/ndb/t/ndb_join_pushdown.inc
 3913 Ole John Aske	2012-05-07
      Some of the SPJ-MTR tests are written to detect failures (previously) caused by
      incorrect handling when the result was retrieved in multiple batches.
      Thus, these tests depends in a specific 'batch size' being used.
      
      As the default batchsize was increased from 64 -> 256 rows in cluster-7.2
      we believe these tests to now be broken.
      
      This fix introduce the debug flags 'max_4rows_in_spj_batches' and
      'max_64rows_in_spj_batches' which will enforce the usage of the
      batchsize as indicated by their names.
      
      This fix is also a preparation for making a fix + testcase for:
      Bug# 14010406 LARGE PUSHED JOIN HIT ASSERT IN SPJ BLOCK

    modified:
      mysql-test/suite/ndb/r/ndb_join_pushdown_default.result
      mysql-test/suite/ndb/t/ndb_join_pushdown.inc
      storage/ndb/src/ndbapi/NdbQueryOperation.cpp
 3912 magnus.blaudd@stripped	2012-05-07 [merge]
      Merge 7.1 -> 7.2

    modified:
      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/store/Operation.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/NdbRecordDeleteOperationImpl.java
      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/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/NdbRecordScanOperationImpl.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-tie/src/main/java/com/mysql/clusterj/tie/OperationImpl.java
      storage/ndb/include/kernel/signaldata/ScanFrag.hpp
      storage/ndb/include/util/SocketAuthenticator.hpp
      storage/ndb/src/common/transporter/Transporter.cpp
      storage/ndb/src/common/transporter/Transporter.hpp
      storage/ndb/src/common/util/SocketAuthenticator.cpp
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
      storage/ndb/test/include/HugoTransactions.hpp
      storage/ndb/test/include/NdbTimer.hpp
      storage/ndb/test/ndbapi/testUpgrade.cpp
      storage/ndb/test/src/HugoTransactions.cpp
      storage/ndb/test/tools/connect.cpp
 3911 magnus.blaudd@stripped	2012-05-07 [merge]
      Merge

    modified:
      mysql-test/lib/My/ConfigFactory.pm
      mysql-test/mysql-test-run.pl
      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/math3.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
 3910 Ole John Aske	2012-05-04
      Fixed Valgrind 'ininitialized memory read' errors caused by previous commit (revno: 3909)
      
      Checking for lock_mode inside ::table_flags() may read uninitialized data, and 
      was not particularly usefull either as part of setting the 'CONST_BLOCK' flag.
      So it has been deemed obsolete and removed in this fix.

    modified:
      sql/ha_ndbcluster.cc
 3909 Ole John Aske	2012-05-03
      ha_ndbcluster::read_first_row() was once implemented as part of the SPJ project
      as we then had plans for pushing queries with 'system' tables as root operation.
      (JT_SYSTEM is the only use case for ::read_first_row())
      
      It was later decided that we should not push such queries, but
      ha_ndbcluster::read_first_row() has remained in the code since then.
      
      There is a default implementation of this method (handler::read_first_row()) which
      is almost identical, except that it does not call ha_rnd_end() / ha_index_end()
      before returning. These calls was removed in our ha_ndbcluster::read_first_row()
      as pushed joins required the resultset to stay 'open' due to the child operations.
      
      However:
       - We do not push queries with 'system' tables so such a change
         is not required.
       - As part of fixing bug#13901890 'SQL NODE CRASHES DURING INSERT SELECT'
         we identified part of the root cause to be an overridden
         ::index_read_idx_map() which also omitted calling rnd_end()/index_end()
         before returning.
      
      This fix removes this obsolete, and potential evil code.

    modified:
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster.h
 3908 Ole John Aske	2012-05-03
      Backported some WL5940 related changes to 7.2-cluster:
      
        The handler extension ::test_push_flag() has now been removed.
        The two remaining HA_PUSH_<foo>-flags related to this extension
        has been made obsolete by:
      
        - HA_PUSH_BLOCK_CONST_TABLE is replaced with the 'test_flag'
          HA_BLOCK_CONST_TABLE. Furthermore it was identified that
          usage of this flag was obsolete at one of the places it was used.
          (As 'system' table optimization is not possible for handlers
           with non-EXACT statistics)
      
        - HA_PUSH_MULTIPLE_DEPENDENCY has been entirely removed as this
          covered a corner case with questionable advantage of being pushed.
          Previous changes to join_no_more_records() has been reverted.

    modified:
      mysql-test/suite/ndb/r/ndb_blob.result
      mysql-test/suite/ndb/r/ndb_dd_sql_features.result
      mysql-test/suite/ndb/r/ndb_join_pushdown_default.result
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster.h
      sql/ha_ndbcluster_push.cc
      sql/handler.h
      sql/sql_select.cc
 3907 John David Duncan	2012-05-01
      Fix bug where the ndb_engine would log to stderr even if some other logger was configured in memcached.

    modified:
      storage/ndb/memcache/src/ndb_engine.c
 3906 Martin Skold	2012-04-30 [merge]
      Setting ndb version to 7.2.7

    modified:
      storage/ndb/VERSION
 3905 Martin Skold	2012-04-30 [merge]
      Merge

 3904 Martin Skold	2012-04-30
      Tagged mysql-5.5.22-ndb-7.2.6

    modified:
      VERSION
 3903 Mauritz Sundell	2012-04-26 {clone-mysql-5.5.22-ndb-7.2.6-src-build} [merge]
      merge 7.1 -> 7.2

    modified:
      storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
 3902 Ole John Aske	2012-04-25
      SPJ Fix: Only try to 'make_pushed_join()' if there are multiple tables in query
      
      We want to keep a 'fast track' through the optimizer for simple, single table queries.
      Thus we should avoid possible overhead from finding join-pushable parts of the query
      if there are only a single table. 

    modified:
      mysql-test/suite/ndb/r/ndb_join_pushdown_default.result
      sql/sql_select.cc
 3901 Jan Wedvik	2012-04-25
      Fix for Bug#13984817 (DATA NODE CRASHES DURING 7.0.16 TO 7.2.4 ONLINE UPGRADE/DOWNGRADE).
      
      This commit adds versions check that will prevent or abort execution of pushed queries if there are data nodes
      that do not support this (i.e. nodes running software version < 7.2).

    modified:
      sql/ha_ndbcluster.cc
      storage/ndb/include/ndb_version.h.in
      storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
      storage/ndb/src/ndbapi/NdbQueryOperation.cpp
 3900 Ole John Aske	2012-04-25
      Fix for Bug#13990924 '64865: LARGE WHERE IN WITH SPJ LEADS TO CLUSTER SHUTDOWN'
      
      As part of developing the SPJ feature, the macro DEBUG_CRASH() was used
      several places where an error occured. I assume the intention
      has been to only (permanently) use this macro in places where we
      did not handle the error gracefully.
      
      However, use of this macro has been exaggerated such that it is
      even used when we catch API errors in the SPJ block which we
      *do* handle by returning an error code.
      
      Furthermore this macro was defined as ndbrequire(false), such that
      we always crash when we hit it - even in GA code.
      
      For this particular bug, the SPJ block detected the condition:
      
           err = DbspjErr::QueryNodeParametersTooBig;
           if (unlikely(param_len >= NDB_ARRAY_SIZE(m_buffer1)))
           {
             DEBUG_CRASH();
             goto error;
           }
      
      Furthermore, there was a check in the SPJ API which was intended to
      prevent sending 'too big' parameters to the SPJ node. However, this check
      was 'size <= 64k', while the actual size limit in SPJ block was 32K!
      
      This fix:
      
       - Redefined DEBUG_CRASH to an ndbassert(false) which will not fail
         in production code.
      
       - Replaced lots of these DEBUG_CRASH() with a jam() in places where
         we do handle the error.
      
       - Increase buffer sizes in SPJ block from 32K -> 64K.

    modified:
      mysql-test/suite/ndb/r/ndb_join_pushdown_default.result
      mysql-test/suite/ndb/t/ndb_join_pushdown.inc
      storage/ndb/src/kernel/blocks/dbspj/Dbspj.hpp
      storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp
 3899 Martin Zaun	2012-04-24 [merge]
      merge from 71 to 72

    modified:
      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
 3898 Frazer Clement	2012-04-24 [merge]
      Merge 7.1->7.2

    modified:
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
      storage/ndb/src/kernel/vm/ArrayPool.hpp
 3897 Frazer Clement	2012-04-24 [merge]
      Merge 7.1->7.2

    modified:
      storage/ndb/include/kernel/signaldata/DihScanTab.hpp
      storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
      storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
      storage/ndb/test/ndbapi/testScan.cpp
      storage/ndb/test/run-test/daily-basic-tests.txt
 3896 John David Duncan	2012-04-23 [merge]
      local merge

    modified:
      mysql-test/lib/My/Memcache.pm
      storage/ndb/memcache/src/ndb_engine.c
      storage/ndb/memcache/src/ndb_engine_private.h
 3895 Ole John Aske	2012-04-23
      Reverted incorrect change of 'tree_name' caused by previous merge from ...7.2-spj

    modified:
      .bzr-mysql/default.conf
 3894 Ole John Aske	2012-04-20 [merge]
      Merged SPJ fixes from branch mysql-5.5-cluster-7.2-spj -> cluster-7.2
      
      These fixes covers:
      
       - Native support of sorted-scan-scan queries in SPJ block
         (Avoid changing query plan to use tempfile + filesort, required by WL5940)
         This is alreay a part of what is reviewed for WL5940.
       - Improved SPJ block error handling, incl. ERROR_INSERTs for testing
       - Added tests to ndb_join_pushdown to check that queries with 
         user defined partitions are not pushed.

    modified:
      .bzr-mysql/default.conf
      mysql-test/suite/ndb/r/ndb_join_pushdown_default.result
      mysql-test/suite/ndb/t/ndb_join_pushdown.inc
      sql/abstract_query_plan.cc
      sql/abstract_query_plan.h
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster.h
      sql/ha_ndbcluster_push.cc
      sql/ha_ndbcluster_push.h
      sql/handler.h
      sql/sql_select.cc
      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/ndbapi/NdbQueryBuilder.cpp
      storage/ndb/src/ndbapi/NdbQueryOperation.cpp
      storage/ndb/test/CMakeLists.txt
      storage/ndb/test/ndbapi/testSpj.cpp
      storage/ndb/test/tools/spj_sanity_test.cpp
 3893 Martin Zaun	2012-04-19 [merge]
      ndbjtie - merge from 71 to 72

 3892 Martin Zaun	2012-04-19 [merge]
      merge from ndb-7.2-ndbjtie-constants-test

    added:
      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
    modified:
      storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NDBAPIConst.java
      storage/ndb/src/ndbjtie/jtie/test/unload/test/MyLoadUnloadTest.java
      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
 3891 magnus.blaudd@stripped	2012-04-18 [merge]
      Merge

    modified:
      mysql-test/lib/mtr_cases.pm
      mysql-test/mysql-test-run.pl
      mysql-test/suite/ndb_memcache/include/have_memcache.inc
 3890 Ole John Aske	2012-04-18
      Fix for bug#13901890 SQL NODE CRASHES DURING INSERT SELECT
      
      There was a bug in the lifetime handling of NdbQuery objects
      where the 'root' of the pushed join had 'type == const'
      
      As part of integrating the pushed join feature into the 
      ha_ndbcluster handler implementation, the default implementation
      of handler::index_read_idx_map() was redefined. This method is
      used as the access function to read the (single) row when
      a table is const'ified by the optimizer.
      
      Basically handler::index_read_idx_map() does (ignoring error handling):
      
        index_init(index, 0);  // Open table for access
        index_read_map();      // Virtual method reading single row
        index_end();           // Return table to 'closed' state + release
      
      As the above 'index_end' would also destruct the resultset from
      the pushed join, including the child result, we could not do that 
      for a pushed join.
      
      Therefore, ha_ndblcluster::index_read_idx_map() was implemented *without*
      the final index_end() call - Our investigation at that time indicated that
      this could be omitted as the open tables was cleaned up anyway, either by the
      next operation on the handler instance, or when the NdbTransaction was terminated.
      
      However, this bugs uncovers that there are codepaths where we both:
      
      - Terminate NdbTransaction, which destruct the NdbQuery object.
      - Then call ha_ndbcluster::reset() to clean up the handler, which will
        result in NdbQuery::close() to be called -> Crash!
      
      Working with this problem I realized that:
      
      - In order to increase pushability we have already introduced the 
        handler::test_push_flag(HA_PUSH_BLOCK_CONST_TABLE) inside the optimizer
        which will block the const'ifying during optimize.
      - It will then only be confusing to still explain these query plan
        having a type == 'const' as they are now really executed as an eq_ref
      - Override ::index_read_idx_map() to suite pushed join execution is
        obsolete if we instead handle these queries as an eq_ref.
      
      These changes does *not* affect the pushability of the queries, nor
      changes number of handler call required to retrieve the data.
      
      However, several EXPLAINS will change where 'type == const' will
      now show 'type==eq_ref' instead which IMHO is more correct.
      
      Also fixes incorrect destruction of NdbQueryImpl objects if 
      construction of these fails in NdbQueryImpl::buildQuery().
      In order to ensure propper cleanup of these we should use 
      NdbQueryImpl::release() instead of deleting them directly.

    modified:
      mysql-test/suite/ndb/r/ndb_dbug_tc_select.result
      mysql-test/suite/ndb/r/ndb_join_pushdown_default.result
      mysql-test/suite/ndb/r/ndb_statistics0.result
      mysql-test/suite/ndb/r/ndb_statistics1.result
      mysql-test/suite/ndb/t/ndb_join_pushdown.inc
      sql/abstract_query_plan.cc
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster.h
      sql/sql_select.cc
      storage/ndb/src/ndbapi/NdbQueryOperation.cpp
 3889 magnus.blaudd@stripped	2012-04-16 [merge]
      Merge 7.1 -> 7.2

    added:
      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
    modified:
      storage/ndb/clusterj/clusterj-api/pom.xml
      storage/ndb/clusterj/clusterj-core/pom.xml
      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/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/AbstractQueryTest.java
      storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryMultiColumnIndexInTest.java
      storage/ndb/clusterj/clusterj-tie/pom.xml
      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/src/mgmsrv/ConfigInfo.cpp
 3888 John David Duncan	2012-04-13
      Add test case for memcache INCR/DECR with binary protocol.
      Fix binary INCR/DECR issues in My::Memcache.pm client lib.
      Fix memcached server to return the math column as the value 
      when there is no value column defined.

    added:
      mysql-test/suite/ndb_memcache/r/math3.result
      mysql-test/suite/ndb_memcache/t/math3.test
      storage/ndb/memcache/unit/sequence.pl
    modified:
      mysql-test/lib/My/Memcache.pm
      storage/ndb/memcache/include/QueryPlan.h
      storage/ndb/memcache/src/Record.cc
      storage/ndb/memcache/src/ndb_worker.cc
 3887 magnus.blaudd@stripped	2012-04-13 [merge]
      Merge 7.1 -> 7.2

    modified:
      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
 3886 magnus.blaudd@stripped	2012-04-13 [merge]
      Merge 7.1 -> 7.2

    modified:
      sql/ha_ndbcluster.cc
 3885 magnus.blaudd@stripped	2012-04-13
      Bug#13947227 "TRANSACTION_ALLOW_BATCHING" VARIABLE NOT FOUND IN THE CLUSTER
      7.2
       - The variable was unfortunately lost when rebasing to 5.5
       - Readd variable, add sys_vars test and enable the ndb_sql_allow_batching 

    added:
      mysql-test/suite/sys_vars/r/transaction_allow_batching_basic.result
      mysql-test/suite/sys_vars/t/transaction_allow_batching_basic.test
    modified:
      mysql-test/suite/ndb/t/disabled.def
      sql/sys_vars.cc
 3884 magnus.blaudd@stripped	2012-04-11
      ndb
       - switch back to use our bundled SSL library since error messages are
       different otherwise and openssl_1.tets fails. We shuld consider
       switching to "yes" again when that problem is fixed

    modified:
      storage/ndb/compile-cluster
 3883 magnus.blaudd@stripped	2012-04-11
      ndb
       - backport fix for storage/ndb/CMakeLists.txt to properly determine if
         ndbcluster is build and thus all of storage.ndb should be built
       - improve comments describing the logic

    modified:
      storage/ndb/CMakeLists.txt
 3882 magnus.blaudd@stripped	2012-04-11 [merge]
      Merge 7.0->7.2

    removed:
      mysql-test/suite/ndb_rpl/t/ndb_rpl_relayrotate-slave.opt
    added:
      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
    modified:
      mysql-test/suite/ndb/r/ndb_restore_misc.result
      mysql-test/suite/ndb/t/ndb_restore_misc.test
      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-openjpa/src/main/java/com/mysql/clusterj/openjpa/NdbOpenJPADomainTypeHandlerImpl.java
      storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/AbstractClusterJTest.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/QueryMultiColumnIndexInTest.java
      storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/SchemaChangeTest.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/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/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/src/common/util/version.cpp
 3881 magnus.blaudd@stripped	2012-04-11 [merge]
      Merge

    modified:
      mysql-test/suite/ndb_rpl/my.cnf
      mysql-test/suite/ndb_rpl/t/ndb_rpl_break_3_chain.cnf
      mysql-test/suite/rpl_ndb/my.cnf
      storage/ndb/compile-cluster
 3880 Ole John Aske	2012-04-11
      Part 2 fix for Bug#13945264: VECTOR TEMPLATE HAS NO SAFE WAY TO SIGNAL 'OUT OF MEMORY' ERRORS
            
      Changes usage of Vector in the SPJ API such that memory alloc failured
      from Vector is now detected by using Vector methods returning an 'int' != 0
      instead of checking 'errno == ENOMEM' 

    modified:
      storage/ndb/src/ndbapi/NdbQueryBuilder.cpp
      storage/ndb/src/ndbapi/NdbQueryOperation.cpp
 3879 Ole John Aske	2012-04-11
      Fix for bug#13945264
      VECTOR TEMPLATE HAS NO SAFE WAY TO SIGNAL 'OUT OF MEMORY' ERRORS
      
      Recommit fixing comments from Magnus B.
      
      The Vector template class does internal memory allocation in 
      several methods which are 'void'.
      As our code is compiled without exceptions, there are no 
      safe way to return an 'out of memory' error from these methods.
      
      The questionable methods are:
        1) Vector<T>::Vector(unsigned sz = 10)  (Constructor)
        2) Vector<T>::Vector(const Vector& src) (Copy constructor)
        3) Vector<T>& Vector<T>::operator=(const Vector<T>& obj)
        4) void Vector<T>::push(const T & t, unsigned pos)
        5) MutexVector<T>::MutexVector(unsigned sz = 10)
      
      For the C'tors taking a size_t argument the implementation did not
      correctly handle the case 'size==0'. We wan't to fix this such that 
      
      - The C'tors should correctly handle 'size==0' such that 
        no initial memory allocation is attempted in these cases,
        Thus no 'out of memory' allocation can be produced.
      
      - Introduce a new 'int ::expand(unsigned sz)' which do an initial
        alloc of the Vector to the specified size.
      
      - Add comments which encourage the user to replace 'Vector(size>0)'
        constructors with 'Vector(0) + ::expand(n)' constructions.
      
      - Add comments which encourage the user to replace copy constructors
        and assignment operators with empty Vector(0) C'tors and then use
        'int Vector::assign()' to fill in the contents.
      
      - Changed Vector::push() to return an 'int' used to signal failure.
      
      Furthermore, no (deep-) copy constructor or assignment operator was
      defined for MutexVector such that an incorrect default C'tor would
      be called. Copy-c'tor and assign operator has now been disallowed.
      
      NOTE: This is part 1 of the fix. There will be a part 2 which fix
      up Vector usage in NdbQueryBuilder and NdbQueryOperator which
      has been reported as a problem in:
      
      https://support.us.oracle.com/oip/faces/secure/ml3/sr/SRDetail.jspx?SRNumber=3-5513205231
      
      
      ... As these problem has not been reproduced locally we are not sure this will
      fix the problem though. However it should improve code quality.
      ******
      Part 2 fix for Bug#13945264: VECTOR TEMPLATE HAS NO SAFE WAY TO SIGNAL 'OUT OF MEMORY' ERRORS
      
      Changes usage of Vector in the SPJ API such that memory alloc failured
      from Vector is now detected by using Vector methods returning an 'int' != 0
      instead of checking 'errno == ENOMEM' 

    modified:
      storage/ndb/include/util/Vector.hpp
 3878 John David Duncan	2012-04-05
      Fix for warnings in CluB.

    modified:
      storage/ndb/memcache/src/ndb_error_logger.cc
      storage/ndb/memcache/src/schedulers/S_sched.cc
 3877 John David Duncan	2012-04-05
      On-demand growth of the NdbInstance pool is enabled by default, and can be explicitly disabled or enabled by setting scheduler option g0 or g1.

    modified:
      storage/ndb/memcache/src/schedulers/S_sched.cc
      storage/ndb/memcache/src/schedulers/S_sched.h
 3876 John David Duncan	2012-04-05
      bug#13890064 -- memcached aborts with "Unknown error code: 13" when binary GET request meets ENGINE_TMPFAIL.

    modified:
      storage/ndb/memcache/extra/memcached/daemon/memcached.c
 3875 John David Duncan	2012-04-05
      Error 9002 was used elsewhere in NDB. 
      Error codes in the memcached engine now start at 29000.

    modified:
      storage/ndb/memcache/include/ndb_engine_errors.h
      storage/ndb/memcache/src/ndb_engine_errors.cc
      storage/ndb/memcache/src/ndb_worker.cc
      storage/ndb/memcache/src/schedulers/S_sched.cc
 3874 John David Duncan	2012-04-05 [merge]
      merge

    modified:
      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/src/ExternalValue.cc
      storage/ndb/memcache/src/ndb_engine.c
      storage/ndb/memcache/src/ndb_engine_errors.cc
      storage/ndb/memcache/src/ndb_error_logger.cc
      storage/ndb/memcache/src/ndb_pipeline.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
 3873 John David Duncan	2012-03-31 [merge]
      local merge

    modified:
      storage/ndb/memcache/include/ndbmemcache_config.in

Diff too large for email (35976 lines, the limit is 10000).
No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.5-cluster-7.2 branch (mysql-re_ww:3873 to 3964) MySQL Release Engineering5 Sep