List:Commits« Previous MessageNext Message »
From:MySQL Build Team Date:December 7 2012 8:46am
Subject:bzr push into mysql-5.5-cluster-7.2 branch (mysql-build:3977 to 4061)
View as plain text  
 4061 Maitrayi Sabaratnam	2012-11-01 {clone-mysql-5.5.28-ndb-7.2.9-src-build} [merge]
      Merge 7.1->7.2

    modified:
      storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
 4060 Martin Skold	2012-11-01 [merge]
      Merge from 7.1

    modified:
      mysql-test/include/wait_for_binlog_event.inc
      mysql-test/suite/ndb_binlog/t/ndb_binlog_variants.test
 4059 Martin Skold	2012-11-01 [merge]
      Merge from 7.1

    modified:
      mysql-test/include/wait_for_binlog_event.inc
 4058 Martin Skold	2012-11-01 [merge]
      Merge from 7.1

    modified:
      mysql-test/include/wait_for_binlog_event.inc
      mysql-test/suite/ndb_binlog/r/ndb_binlog_variants.result
      mysql-test/suite/ndb_binlog/t/ndb_binlog_variants.test
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster.h
      sql/ndb_thd_ndb.h
 4057 Dyre Tjeldvoll	2012-11-01 [merge]
      Merge to 7.2

    modified:
      storage/ndb/memcache/unit/test_workqueue.c
 4056 Maitrayi Sabaratnam	2012-11-01 [merge]
      Merge 7.1->7.2

    modified:
      storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
 4055 Maitrayi Sabaratnam	2012-10-31 [merge]
      Merge 7.1->7.2

    modified:
      storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
 4054 Pekka Nousiainen	2012-10-30 [merge]
      merge to 7.2

    modified:
      storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
 4053 Frazer Clement	2012-10-30 [merge]
      Merge 7.1->7.2

    added:
      storage/ndb/src/kernel/vm/CountingSemaphore.hpp
    modified:
      storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp
      storage/ndb/src/kernel/blocks/ERROR_codes.txt
      storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp
      storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
      storage/ndb/test/ndbapi/testLimits.cpp
      storage/ndb/test/run-test/daily-basic-tests.txt
 4052 Pekka Nousiainen	2012-10-27 [merge]
      merge to 7.2

    modified:
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
 4051 Pekka Nousiainen	2012-10-24 [merge]
      merge to 7.2

    modified:
      storage/ndb/src/kernel/blocks/ERROR_codes.txt
      storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
      storage/ndb/src/ndbapi/ndberror.c
      storage/ndb/test/ndbapi/testBasic.cpp
      storage/ndb/test/run-test/daily-basic-tests.txt
 4050 Craig L Russell	2012-10-23
      Remove dependency on junit for clusterj-test and clusterj-jpatest
        remove test for existence of junit on WITH-CLASSPATH
        include files from clusterj-unit in clusterj-test and clusterj-jpatest
        always build clusterj-test and clusterj-jpatest if building clusterj

    modified:
      storage/ndb/clusterj/CMakeLists.txt
      storage/ndb/clusterj/clusterj-jpatest/CMakeLists.txt
      storage/ndb/clusterj/clusterj-test/CMakeLists.txt
 4049 Martin Skold	2012-10-22 [merge]
      Null merge of 7.1

 4048 Craig L Russell	2012-10-21
      Make QueryUniqueKeyTest satisfy junit

    modified:
      storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryUniqueKeyTest.java
 4047 Craig L Russell	2012-10-21
      Reenable SchemaChangeTest... really
      It should be easy to enable and disable tests, just use @org.junit.Ignore... done
      But this doesn't work for some reason on CLUB
      So while we are waiting for clusterj-unit to be enabled, we have to make junit happy

    modified:
      storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/SchemaChangeTest.java
 4046 Craig L Russell	2012-10-21
      Reenable SchemaChangeTest since it was unfairly accused
      Disable QueryUniqueKeyTest in a way that junit might enjoy

    modified:
      storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryUniqueKeyTest.java
      storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/SchemaChangeTest.java
 4045 Craig L Russell	2012-10-21
      Rename failing test methods to avoid junit complaints

    modified:
      storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryUniqueKeyTest.java
      storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/SchemaChangeTest.java
 4044 Craig L Russell	2012-10-21
      Try disabling QueryUniqueKeyTest that seems to be causing ndb crash

    modified:
      storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryUniqueKeyTest.java
 4043 Craig L Russell	2012-10-21
      Try harder to disable SchemaChangeTest in clusterj

    modified:
      storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/SchemaChangeTest.java
 4042 Craig L Russell	2012-10-20
      Patch clusterj to print the class name each time setUp is called, to track down failing CLUB test.

    modified:
      storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/AbstractClusterJTest.java
 4041 Craig L Russell	2012-10-20
      Improve test reporting for clusterj
      Remove distracting logging output from QueryOrderingTest
      Add default listener to TestResult
      Add system output to TestCase to track each test

    modified:
      storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryOrderingTest.java
      storage/ndb/clusterj/clusterj-unit/src/main/java/junit/framework/TestCase.java
      storage/ndb/clusterj/clusterj-unit/src/main/java/junit/framework/TestResult.java
 4040 Craig L Russell	2012-10-18
      Disable SchemaChangeTest to isolate CLUB clusterj failures

    modified:
      storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/SchemaChangeTest.java
 4039 Pekka Nousiainen	2012-10-18 [merge]
      merge

    modified:
      BUILD/compile-dist
      storage/ndb/CMakeLists.txt
      storage/ndb/src/common/portlib/NdbThread.c
 4038 Pekka Nousiainen	2012-10-17 [merge]
      merge to 7.2

    modified:
      storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.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/vm/SimulatedBlock.hpp
 4037 Pekka Nousiainen	2012-10-17 [merge]
      merge to 7.2

    modified:
      sql/ha_ndbcluster_binlog.cc
 4036 magnus.blaudd@stripped	2012-10-17
      Turn off build of NDB's Java components in
      BUILD/compile-dist

    modified:
      BUILD/compile-dist
 4035 magnus.blaudd@stripped	2012-10-17 [merge]
      Merge 7.1 -> 7.2

    modified:
      mysql-test/lib/My/Exec.pm
      mysql-test/suite/ndb/t/ndb_backup_rate.test
      storage/ndb/clusterj/clusterj-jdbc/src/test/java/jdbctest/JDBCQueryTest.java
      storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/Utility.java
 4034 magnus.blaudd@stripped	2012-10-17
      Honour the MTR_BINDIR variable which is set by mtr
      in out of source builds and points to the build location

    modified:
      mysql-test/suite/ndb/include/have_clusterj.inc
      mysql-test/suite/ndb/include/have_clusterj_jpa.inc
      mysql-test/suite/ndb/include/have_ndb_rqg.inc
      mysql-test/suite/ndb/include/have_ndbjtie_junit.inc
      mysql-test/suite/ndb/include/ndb_info.inc
      mysql-test/suite/ndb/t/have_ndb_dist_priv.inc
      mysql-test/suite/ndb/t/have_ndbinfo.inc
 4033 magnus.blaudd@stripped	2012-10-16
      ndb
       - make it possible to set the default value to use for
         WITH_NDB_JAVA true the environment variable WITH_NDB_JAVA_DEFAULT
       - set WITH_NDB_JAVA default to ON

    modified:
      storage/ndb/CMakeLists.txt
 4032 Jan Wedvik	2012-10-15
      Fix build break on Windows.

    modified:
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
 4031 Jan Wedvik	2012-10-15
      This commit fixes Bug#14647210 "CAN CRASH ALL NODES EASILY WHEN 
      RESTARTING MORE THAN 6 NODES SIMULTANEOUSLY":
      
      * It implements Dbdict::execGET_TABINFOREF(). This function will resend 
      GET_TABINFOREQ if the DICT master was busy. 
      
      * It removes local queueing of GET_TABINFOREQ signals (via delayed 
      signals) for signals coming from another DICT block.
      
      * It implements a regression test for this bug.
      
      * It adds a version check, such that GET_TABINFOREF will not be sent
      to DICT blocks where the software is too old to handle that signal.

    modified:
      storage/ndb/include/ndb_version.h.in
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp
      storage/ndb/test/ndbapi/testDict.cpp
      storage/ndb/test/run-test/daily-basic-tests.txt
 4030 John David Duncan	2012-10-12 [merge]
      merge

    added:
      mysql-test/suite/ndb_memcache/include/misc_tables.inc
    modified:
      mysql-test/lib/My/Memcache.pm
      mysql-test/suite/ndb_memcache/include/datatypes_tables.inc
      mysql-test/suite/ndb_memcache/r/external_values.result
      mysql-test/suite/ndb_memcache/t/external_values.test
      mysql-test/suite/ndb_memcache/t/math3.test
      mysql-test/suite/ndb_memcache/t/mpart_key.test
      mysql-test/suite/ndb_memcache/t/type_char.test
      mysql-test/suite/ndb_memcache/t/unique_idx.test
 4029 magnus.blaudd@stripped	2012-10-12
      ndb
       - keep WITH_NDB_JAVA set to OFF a few more days

    modified:
      storage/ndb/CMakeLists.txt
 4028 Martin Skold	2012-10-12 [merge]
      Merged in 5.5.28

    removed:
      extra/yassl/taocrypt/src/crypto.cpp
      extra/yassl/taocrypt/test.dsp
    added:
      extra/yassl/taocrypt/test/test.dsp
      mysql-test/suite/federated/include/
      mysql-test/suite/innodb/r/innodb_information_schema_buffer.result
      mysql-test/suite/innodb/t/innodb_information_schema_buffer.test
    renamed:
      mysql-test/suite/federated/federated.inc => mysql-test/suite/federated/include/federated.inc
      mysql-test/suite/federated/federated_cleanup.inc => mysql-test/suite/federated/include/federated_cleanup.inc
      mysql-test/suite/federated/have_federated_db.inc => mysql-test/suite/federated/include/have_federated_db.inc
    modified:
      CMakeLists.txt
      Docs/INSTALL-BINARY
      VERSION
      client/mysql.cc
      client/mysql_upgrade.c
      client/mysqladmin.cc
      client/mysqlbinlog.cc
      client/mysqlcheck.c
      client/mysqldump.c
      client/mysqlimport.c
      client/mysqlshow.c
      client/mysqlslap.c
      client/mysqltest.cc
      client/sql_string.h
      cmake/ssl.cmake
      extra/perror.c
      extra/yassl/README
      extra/yassl/include/lock.hpp
      extra/yassl/include/openssl/ssl.h
      extra/yassl/include/yassl_error.hpp
      extra/yassl/src/cert_wrapper.cpp
      extra/yassl/src/lock.cpp
      extra/yassl/src/ssl.cpp
      extra/yassl/src/yassl_error.cpp
      extra/yassl/taocrypt/include/aes.hpp
      extra/yassl/taocrypt/include/pwdbased.hpp
      extra/yassl/taocrypt/src/asn.cpp
      extra/yassl/taocrypt/src/coding.cpp
      extra/yassl/taocrypt/taocrypt.dsw
      extra/yassl/taocrypt/test/memory.cpp
      extra/yassl/yassl.dsw
      include/mysql/thread_pool_priv.h
      include/welcome_copyright_notice.h
      mysql-test/r/information_schema.result
      mysql-test/r/log_state.result
      mysql-test/r/mysqlshow.result
      mysql-test/r/openssl_1.result
      mysql-test/r/subselect.result
      mysql-test/r/variables.result
      mysql-test/suite/federated/federated.test
      mysql-test/suite/federated/federated_archive.test
      mysql-test/suite/federated/federated_bug_13118.test
      mysql-test/suite/federated/federated_bug_25714.test
      mysql-test/suite/federated/federated_bug_35333.test
      mysql-test/suite/federated/federated_debug.test
      mysql-test/suite/federated/federated_innodb.test
      mysql-test/suite/federated/federated_server.test
      mysql-test/suite/federated/federated_transactions.test
      mysql-test/suite/funcs_1/t/is_engines_federated.test
      mysql-test/suite/ndb/r/ndb_gis.result
      mysql-test/suite/perfschema/t/disabled.def
      mysql-test/suite/rpl/r/rpl_cant_read_event_incident.result
      mysql-test/suite/rpl/t/rpl_bug41902.test
      mysql-test/suite/rpl/t/rpl_cant_read_event_incident.test
      mysql-test/suite/sys_vars/r/engine_condition_pushdown_basic.result
      mysql-test/suite/sys_vars/r/log_basic.result
      mysql-test/suite/sys_vars/r/log_slow_queries_basic.result
      mysql-test/suite/sys_vars/r/rpl_recovery_rank_basic_32.result
      mysql-test/suite/sys_vars/r/rpl_recovery_rank_basic_64.result
      mysql-test/suite/sys_vars/r/sql_big_selects_func.result
      mysql-test/suite/sys_vars/r/sql_max_join_size_basic.result
      mysql-test/suite/sys_vars/r/sql_max_join_size_func.result
      mysql-test/t/openssl_1.test
      mysql-test/t/partition_federated.test
      mysys/mf_iocache.c
      mysys/my_getopt.c
      scripts/mysql_secure_installation.pl.in
      scripts/mysql_secure_installation.sh
      scripts/mysqlhotcopy.sh
      sql/filesort.cc
      sql/gen_lex_hash.cc
      sql/ha_partition.cc
      sql/ha_partition.h
      sql/handler.cc
      sql/item.cc
      sql/item.h
      sql/item_strfunc.cc
      sql/item_subselect.cc
      sql/log.cc
      sql/log_event.h
      sql/mdl.cc
      sql/mdl.h
      sql/mysqld.cc
      sql/opt_range.cc
      sql/set_var.cc
      sql/set_var.h
      sql/share/charsets/Index.xml
      sql/share/errmsg-utf8.txt
      sql/spatial.cc
      sql/spatial.h
      sql/sql_base.cc
      sql/sql_class.cc
      sql/sql_plugin.cc
      sql/sql_prepare.cc
      sql/sql_select.cc
      sql/sql_string.h
      sql/sys_vars.cc
      sql/sys_vars.h
      storage/archive/ha_archive.cc
      storage/federated/ha_federated.cc
      storage/innobase/btr/btr0btr.c
      storage/innobase/btr/btr0cur.c
      storage/innobase/btr/btr0pcur.c
      storage/innobase/buf/buf0buf.c
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/handler/i_s.cc
      storage/innobase/handler/i_s.h
      storage/innobase/ibuf/ibuf0ibuf.c
      storage/innobase/include/buf0buf.h
      storage/innobase/include/buf0buf.ic
      storage/innobase/include/fil0fil.h
      storage/innobase/include/log0log.h
      storage/innobase/page/page0page.c
      storage/innobase/row/row0ins.c
      storage/innobase/row/row0merge.c
      storage/myisam/ha_myisam.cc
      support-files/compiler_warnings.supp
      support-files/mysql.spec.sh
      tests/mysql_client_fw.c
      tests/mysql_client_test.c
      vio/viosslfactories.c
      mysql-test/suite/federated/include/federated.inc
 4027 Bernd Ocklin	2012-10-12
      make java missing error fatal

    modified:
      storage/ndb/CMakeLists.txt
 4026 Bernd Ocklin	2012-10-12
      Bug#12379755 STOP COMPILING ANYTHING RELATED TO JAVA

    modified:
      storage/ndb/CMakeLists.txt
 4025 Bernd Ocklin	2012-10-12
      fix ndbjtie cmake issue on some win

    modified:
      storage/ndb/src/ndbjtie/CMakeLists.txt
 4024 Maitrayi Sabaratnam	2012-10-12 [merge]
      Merge 7.1->7.2

    modified:
      storage/ndb/src/mgmclient/CommandInterpreter.cpp
      storage/ndb/src/mgmsrv/ConfigInfo.cpp
 4023 John David Duncan	2012-10-11 [merge]
      merge

    modified:
      storage/ndb/src/ndbclient_exports.cpp
      storage/ndb/src/ndbjtie/ndbjtie_lib.cpp
      storage/ndb/tools/delete_all.cpp
      storage/ndb/tools/desc.cpp
      storage/ndb/tools/drop_index.cpp
      storage/ndb/tools/drop_tab.cpp
      storage/ndb/tools/listTables.cpp
      storage/ndb/tools/ndb_config.cpp
      storage/ndb/tools/ndbinfo_select_all.cpp
      storage/ndb/tools/restore/restore_main.cpp
      storage/ndb/tools/select_all.cpp
      storage/ndb/tools/select_count.cpp
      storage/ndb/tools/waiter.cpp
      support-files/mysql.spec.sh
 4022 John David Duncan	2012-10-11
      memcached sends temporary error to client in case of NDB Error 410.
      My::Memcached.pl can tolerate some amount of temporary errors.
      These changes should fix spurious failures of the ndb_memcache.external_values test.

    modified:
      mysql-test/lib/My/Memcache.pm
      storage/ndb/memcache/src/ndb_worker.cc
 4021 John David Duncan	2012-10-11
      This adds some handling of temporary errors to the perl Memcache client
      in mysql-test.  The client will sleep, then retry the operation.

    modified:
      mysql-test/lib/My/Memcache.pm
 4020 Ole John Aske	2012-10-05 [merge]
      Merge 7.1 -> 7.2

    modified:
      storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp
 4019 Ole John Aske	2012-10-04 [merge]
      Merge 7.1 -> 7.2

    modified:
      storage/ndb/src/kernel/error/ErrorReporter.cpp
 4018 magnus.blaudd@stripped	2012-10-04 [merge]
      Merge

    modified:
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster_binlog.cc
 4017 Ole John Aske	2012-10-04 [merge]
      Merge 7.1 -> 7.2

    modified:
      storage/ndb/test/ndbapi/testSpj.cpp
 4016 Frazer Clement	2012-09-29 [merge]
      Merge 7.1->7.2

    modified:
      scripts/mysql_system_tables.sql
      storage/ndb/include/transporter/TransporterRegistry.hpp
      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/transporter/TransporterRegistry.cpp
      storage/ndb/src/kernel/blocks/trpman.cpp
      storage/ndb/src/kernel/vm/NdbinfoTables.cpp
      storage/ndb/tools/ndbinfo_sql.cpp
 4015 Frazer Clement	2012-09-29 [merge]
      Merge 7.1->7.2

 4014 Mauritz Sundell	2012-09-28 [merge]
      merge 7.1 -> 7.2

    added:
      mysql-test/suite/ndb_big/bug14000373.cnf
      mysql-test/suite/ndb_big/bug14000373.result
      mysql-test/suite/ndb_big/bug14000373.test
      storage/ndb/src/kernel/vm/LHLevel.cpp
      storage/ndb/src/kernel/vm/LHLevel.hpp
    modified:
      storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp
      storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
      storage/ndb/src/kernel/vm/CMakeLists.txt
      storage/ndb/src/ndbjtie/jtie/jtie_tconv_array_impl.hpp
 4013 bernd.ocklin@stripped	2012-09-27
      fix clusterj install version number to be equal to jar version number

    modified:
      storage/ndb/clusterj/CMakeLists.txt
      storage/ndb/clusterj/clusterj-api/CMakeLists.txt
 4012 bernd.ocklin@stripped	2012-09-27
      fix wix 5.5.25a version number problem

    modified:
      packaging/WiX/create_msi.cmake.in
 4011 Ole John Aske	2012-09-25 [merge]
      Merge 7.1 -> 7.2

    modified:
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
 4010 Maitrayi Sabaratnam	2012-09-25 [merge]
      Merge 7.1->7.2

    modified:
      storage/ndb/src/kernel/angel.cpp
      storage/ndb/src/kernel/angel.hpp
      storage/ndb/src/kernel/main.cpp
      storage/ndb/src/kernel/ndbd.cpp
      storage/ndb/src/kernel/ndbd.hpp
      storage/ndb/src/kernel/vm/Configuration.cpp
      storage/ndb/src/kernel/vm/Configuration.hpp
      storage/ndb/src/mgmapi/mgmapi.cpp
 4009 Ole John Aske	2012-09-24
      Fixed possible deadlock / timeout in ndb_spj_dict.test:
      
      This test has two parallel server connection:
      
      1) Started a (pushed) join possibly creating a lot of result rows
      2) Do some alter table DDLs which is expected to terminate query in 1)
      
      However, as 1) created a lots of result, which is sent through the client-server
      interface with a TCP 'write()', the TCP send/recv buffers may fill up. If these
      buffers became  completely filled before the query was killed by the the DDL, we
      seems to enter a deadlock state where neither the DDL is able to execute, and no
      further communication can take place. Thus, the MTR test timed out with 
      'Lost connection to the MySQL server'.
      
      This fix change to using a 'select count(*)' instead of a plain 'select *' in
      order to avoid saturated TCP buffers.

    modified:
      mysql-test/suite/ndb/r/ndb_spj_dict.result
      mysql-test/suite/ndb/t/ndb_spj_dict.test
 4008 Mauritz Sundell	2012-09-21 [merge]
      merge 7.1->7.2, no changes

 4007 Mauritz Sundell	2012-09-21 [merge]
      merge 7.1 -> 7.2

    added:
      storage/ndb/include/util/ndb_math.h
    modified:
      mysql-test/suite/ndb/r/ndb_native_default_support.result
      storage/ndb/include/ndbapi/NdbDictionary.hpp
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
      storage/ndb/src/ndbapi/NdbDictionary.cpp
      storage/ndb/test/include/NDBT_Table.hpp
      storage/ndb/test/ndbapi/testDict.cpp
      storage/ndb/test/run-test/daily-basic-tests.txt
      storage/ndb/test/src/NDBT_Table.cpp
      storage/ndb/tools/desc.cpp
 4006 magnus.blaudd@stripped	2012-09-21 [merge]
      Merge

 4005 magnus.blaudd@stripped	2012-09-21 [merge]
      Merge

    modified:
      sql/ha_ndb_index_stat.cc
      sql/ha_ndb_index_stat.h
 4004 Ole John Aske	2012-09-21 [merge]
      Cleanup of missing merge 7.1 -> 7.2

    modified:
      mysql-test/suite/ndb/t/ndb_alter_table_dml.test
 4003 Jan Wedvik	2012-09-21
      This commit is a backport of the fix for Bug#14644936 
      "INEFFICIENT AND INCORRECT EXECUTION OF PUSHABLE OUTER JOINS".
      
      This commit also adds a regression test,
      since this bug can only be reproduced in cluster.

    modified:
      mysql-test/suite/ndb/r/ndb_join_pushdown_default.result
      mysql-test/suite/ndb/t/ndb_join_pushdown.inc
      sql/sql_select.cc
 4002 magnus.blaudd@stripped	2012-09-20
      ndb
       - Make at least one symbol in ndbclient exported on Windows to make
        sure that export lib is generated

    modified:
      storage/ndb/src/ndbclient_exports.cpp
 4001 magnus.blaudd@stripped	2012-09-20 [merge]
      Merge

    added:
      storage/ndb/src/ndbclient_link_test.cpp
    renamed:
      storage/ndb/src/dummy.cpp => storage/ndb/src/ndbclient_exports.cpp
    modified:
      storage/ndb/src/CMakeLists.txt
      storage/ndb/src/ndbjtie/CMakeLists.txt
      storage/ndb/test/src/CMakeLists.txt
      storage/ndb/src/ndbclient_exports.cpp
 4000 Ole John Aske	2012-09-19
      Attempt to remove some MTR test failures:
      
      Exclude 'rows' column from explained results as this
      is only an estimate, and it seems to slightly vary 
      between OS'e, HW and ... phase of moon

    modified:
      mysql-test/suite/ndb/r/ndb_spj_dict.result
      mysql-test/suite/ndb/t/ndb_spj_dict.test
 3999 bernd.ocklin@stripped	2012-09-19
      add diagnostic output to pb2 clusterj-api.jar win compile issue

    modified:
      storage/ndb/clusterj/clusterj-api/CMakeLists.txt
 3998 Ole John Aske	2012-09-19
      Fixing more red MTR test:
      
      Also the new ndb_spj_dict.test used multiple server connections, and
      thus had to be prevented from running on an embedded server.

    modified:
      mysql-test/suite/ndb/t/ndb_spj_dict.test
 3997 Ole John Aske	2012-09-19
      Merge 7.1 -> 7.2

    modified:
      mysql-test/suite/ndb/t/ndb_alter_table_dml.test
 3996 Ole John Aske	2012-09-19 [merge]
      Merge of fix for bug#14103195 7.1 -> 7.2.
      
      Also added the testcase for this fix as SPJ testing 
      is impossible for versions prior to 7.2.

    added:
      mysql-test/suite/ndb/r/ndb_spj_dict.result
      mysql-test/suite/ndb/t/ndb_spj_dict.test
      storage/ndb/src/kernel/blocks/dbgdm/
      storage/ndb/src/kernel/blocks/dbgdm/DbgdmProxy.cpp
      storage/ndb/src/kernel/blocks/dbgdm/DbgdmProxy.hpp
    modified:
      sql/ha_ndbcluster.cc
      storage/ndb/include/kernel/kernel_config_parameters.h
      storage/ndb/include/kernel/signaldata/DbspjErr.hpp
      storage/ndb/include/kernel/signaldata/PrepDropTab.hpp
      storage/ndb/src/kernel/blocks/CMakeLists.txt
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp
      storage/ndb/src/kernel/blocks/dbspj/Dbspj.hpp
      storage/ndb/src/kernel/blocks/dbspj/DbspjInit.cpp
      storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp
      storage/ndb/src/kernel/blocks/dbspj/DbspjProxy.cpp
      storage/ndb/src/kernel/blocks/dbspj/DbspjProxy.hpp
      storage/ndb/src/kernel/blocks/dbtc/DbtcProxy.cpp
      storage/ndb/src/kernel/blocks/dbtc/DbtcProxy.hpp
      storage/ndb/src/kernel/vm/Configuration.cpp
      storage/ndb/src/kernel/vm/pc.hpp
      storage/ndb/src/ndbapi/ndberror.c
      storage/ndb/test/ndbapi/testSpj.cpp
 3995 Maitrayi Sabaratnam	2012-09-18 [merge]
      Merge 7.1->7.2

    added:
      mysql-test/suite/ndb/r/ndb_alter_table_dml.result
      mysql-test/suite/ndb/t/ndb_alter_table_dml.test
    modified:
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
      storage/ndb/src/ndbapi/ndberror.c
 3994 Ole John Aske	2012-09-17
      Additional fix for bug#14577463 CONCURRENT DDL & DML LOAD MAY CRASH MYSQLD
      
      The previous fix for this bug was not sufficient, so the bug was reopened.
      This fix takes care of another problem related to ref-counting and
      freeing of the NDB_SHARE object:
      
      If a NDB_SHARE becomes 'trailing' (It has state==NSS_DROPPED, but there are 
      still other active operations which are using the 'to be dropped NDB_SHARE')
      then the NDB_SHARE will both be in the 'ndbcluster_dropped_tables'
      and 'ndbcluster_open_tables'.
      
      ndbcluster_real_free_share() must therefore always my_hash_delete() a 
      'NSS_DROPPED share' from both 'dropped' and 'open' tables before 
      it can destruct the NDB_SHARE object.
      
      This fix is relevant for Cluster 7.2 --> only as there are no
      'dropped table' hash in 7.0.

    modified:
      sql/ha_ndbcluster.cc
 3993 Frazer Clement	2012-09-13 [merge]
      Merge 7.1->7.2

    added:
      mysql-test/suite/ndb/r/ndb_backup_rate.result
      mysql-test/suite/ndb/t/ndb_backup_rate.cnf
      mysql-test/suite/ndb/t/ndb_backup_rate.test
    modified:
      storage/ndb/src/kernel/blocks/backup/Backup.cpp
      storage/ndb/src/kernel/blocks/backup/Backup.hpp
 3992 Ole John Aske	2012-09-13 [merge]
      Merge 7.1 -> 7.2 of fix for bug#14577463 
      
      There has been significant changes in the alter table code from 5.1 to 5.5,
      thus a refactored version of this fix is required for Cluster-7.2
            
      The main changes are due to handle_trailing_share() has now been removed
      from ndbcluster_create_binlog_setup() which is called as part of
      ndb_create_table_from_engine(). Therefore I had to add a
      call to handle_trailing_share() to handle_offline_alter_table_commit()
      itself. (Also removed the comment: '...ndb_create_table_from_engine()
      may delete what share is pointing to ...' as that was incorrect.)
            
      NOTE: handle_trailing_share() *is* required instead of the single
      free_share() it effectively replaces: We have to ensure that all
      (trailing) referrences to this share goes away such that the later
      ndb_create_table_from_engine() correctly recreates a new share instance.
      (Instead if reusing the old which may still exist if it had other referres)
      
      Upon request from Reviewer (Magnus), the previous suppression of warning:
      '...Moving away for safety, but possible memleak' thrown in ha_ndbcluster.cc
      has been removed. Instead we 'call mtr.add_suppression(...) in the MTR test.
      There might be such suppressions missing from other tests, but I intend to
      clean that up in a seperate commit.

    modified:
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster_binlog.cc
 3991 Ole John Aske	2012-09-13 [merge]
      Merge 7.1 -> 7.2

    modified:
      storage/ndb/include/transporter/TransporterRegistry.hpp
      storage/ndb/src/common/transporter/TransporterRegistry.cpp
 3990 Ole John Aske	2012-09-13 [merge]
      Merge 7.1 -> 7.2

    modified:
      storage/ndb/src/common/transporter/TransporterRegistry.cpp
 3989 Ole John Aske	2012-09-13 [merge]
      Merge 7.1 -> 7.2

    added:
      mysql-test/suite/ndb/t/ndb_mt_recv-master.opt
      mysql-test/suite/ndb/t/ndb_mt_recv.cnf
      mysql-test/suite/ndb/t/ndb_mt_recv.test
    modified:
      storage/ndb/src/common/transporter/TransporterRegistry.cpp
 3988 Jan Wedvik	2012-09-13 [merge]
      Merge 7.1->7.2

    modified:
      storage/ndb/src/ndbapi/NdbQueryBuilder.cpp
      storage/ndb/test/ndbapi/testSpj.cpp
      storage/ndb/test/run-test/daily-basic-tests.txt
 3987 Frazer Clement	2012-09-12 [merge]
      Merge 7.1->7.2

    modified:
      sql/ha_ndb_index_stat.cc
      sql/ha_ndb_index_stat.h
      storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp
      storage/ndb/include/util/NdbOut.hpp
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
      storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
      storage/ndb/src/mgmapi/LocalConfig.cpp
      storage/ndb/src/mgmapi/LocalConfig.hpp
      storage/ndb/test/include/NDBT_Stats.hpp
      storage/ndb/test/ndbapi/testRedo.cpp
      storage/ndb/test/ndbapi/testScan.cpp
      storage/ndb/test/run-test/daily-basic-tests.txt
 3986 Maitrayi Sabaratnam	2012-09-07 [merge]
      Merge 7.1->7.2
      
      In addition to the fix for Bug 14582294 - SPJ: GETNODES DOES NOT RETURN CORRCT ERROR CODE and other merges, this adds a FI test case to testSpj, to verify the fix. This test case is not present in 7.0 and 7.1.

    modified:
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
      storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp
      storage/ndb/test/ndbapi/testDict.cpp
      storage/ndb/test/ndbapi/testSpj.cpp
 3985 Martin Skold	2012-09-03
      Supressed warnings imported from mysql-5.5

    modified:
      support-files/compiler_warnings.supp
 3984 Martin Skold	2012-09-03
      Supressed warnings imported from mysql-5.5

    modified:
      support-files/compiler_warnings.supp
 3983 Martin Skold	2012-09-03
      Removed compiler warning

    modified:
      storage/ndb/test/ndbapi/testRedo.cpp
 3982 Maitrayi Sabaratnam	2012-08-29 [merge]
      Merge from 71 to 72

    modified:
      storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
      storage/ndb/test/ndbapi/testDict.cpp
 3981 Ole John Aske	2012-08-24 [merge]
      Merge 7.1 -> 7.2
      
      Also added the ndb_many_fragments.test which does SPJ testing of
      the fix for bugs #14143553 and #13799800 in this merge.

    added:
      mysql-test/suite/ndb/r/ndb_many_fragments.result
      mysql-test/suite/ndb/t/ndb_many_fragments.cnf
      mysql-test/suite/ndb/t/ndb_many_fragments.test
    modified:
      mysql-test/mysql-test-run.pl
      storage/ndb/include/kernel/signaldata/DihScanTab.hpp
      storage/ndb/include/kernel/signaldata/TcContinueB.hpp
      storage/ndb/src/kernel/blocks/backup/Backup.cpp
      storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.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/suma/Suma.cpp
      storage/ndb/src/ndbapi/ndberror.c
      storage/ndb/test/ndbapi/testScan.cpp
      storage/ndb/test/ndbapi/testSpj.cpp
 3980 Ole John Aske	2012-08-24 [merge]
      Null merge 7.1 -> 7.2

 3979 Jan Wedvik	2012-08-22 [merge]
      Merged 7.1 -> 7.2

    modified:
      storage/ndb/include/kernel/signaldata/SchemaTrans.hpp
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
      storage/ndb/test/ndbapi/testDict.cpp
      storage/ndb/test/run-test/daily-basic-tests.txt
 3978 Martin Skold	2012-08-17
      Bump version to 7.2.9

    modified:
      VERSION
      storage/ndb/VERSION
 3977 mysql-builder@stripped	2012-08-16 {clone-mysql-5.5.27-ndb-7.2.8-src-build}
      


Diff too large for email (25039 lines, the limit is 10000).
No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.5-cluster-7.2 branch (mysql-build:3977 to 4061) MySQL Build Team7 Dec