From: MySQL Release Engineering Date: September 7 2012 7:06am Subject: bzr push into mysql-5.5-cluster-7.2 branch (mysql-re_ww:3964 to 3977) List-Archive: http://lists.mysql.com/commits/144705 Message-Id: <20120907070609.27403.54338.3977@trollheim.no.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3977 mysql-builder@stripped 2012-08-16 {clone-mysql-5.5.27-ndb-7.2.8-src-build} 3976 Martin Skold 2012-08-16 Bug#12623923 SERVER CAN CRASH AFTER FAILURE TO CREATE PRIMARY KEY WITH INNODB TABLES: Merged in main line patch, but it only fixes the scenario where indexes need to be dropped to rollback DDL statement, if indexes have been dropped they need to be put back, dodgy code. If engine doesn't handle this internally then it should declare it cannot handle multiple changes in on DDL command. Disable test case since it doesn't work with online alter implementation modified: sql/handler.cc 3975 Ole John Aske 2012-08-14 Fix for Bug#14489398 CLUSTER BACKUP FAILS WHEN USING NDBMTD AND CONFIGURED MULTIPLE LQHS Fix regression introduced by push: 3923 Ole John Aske 2012-05-23 This is the improved 'save_mem.patch' from Mikael R. patch set That push tried to save memory used for interthread communication buffers by not allocated buffers between those threads which was assumed to not communicate. LDM <-> LDM communication was one of the places where such buffers where removed. However, the BACKUP-block is part of the LDM thread, and during backup the first BACKUP instance in LDM thread#1 will act as client/coordinator. Thus it *will* communicate with other LDM threads! This fix introduce special handling of LDM thread#1, and 'opens up' communication between that thread and other LDM threads. Instead of writing a completely new testcase to cover this fix, I have introduced 'ndb_restore_misc.cnf' which overrides 'MaxNoOfExecutionThreads=4' - Such that at least one of the existing backup-restore tests are run with multiple LDM threads. If the BACKUP is later made full multithreaded, the changes to mt.cpp in this patch should be reverted. added: mysql-test/suite/ndb/t/ndb_restore_misc.cnf modified: storage/ndb/src/kernel/vm/mt.cpp 3974 Frazer Clement 2012-08-13 [merge] Merge 7.1->7.2 modified: storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp 3973 Frazer Clement 2012-08-13 [merge] Merge 7.1->7.2 added: storage/ndb/test/ndbapi/testRedo.cpp modified: storage/ndb/include/mgmapi/ndb_logevent.h 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/src/mgmapi/ndb_logevent.cpp storage/ndb/test/ndbapi/CMakeLists.txt storage/ndb/test/run-test/daily-basic-tests.txt 3972 Martin Skold 2012-08-13 [merge] Merged in 5.5.27 added: mysql-test/include/mysqlbinlog_have_debug.inc mysql-test/suite/sys_vars/r/slave_max_allowed_packet_basic.result mysql-test/suite/sys_vars/t/slave_max_allowed_packet_basic.test tests/mysql_client_fw.c modified: .bzrignore VERSION client/client_priv.h client/mysql.cc client/mysqladmin.cc client/mysqlbinlog.cc client/mysqldump.c client/mysqlslap.c client/mysqltest.cc extra/yassl/taocrypt/src/asn.cpp include/my_getopt.h include/mysql.h include/mysql.h.pp include/sql_common.h libmysql/libmysql.c libmysqld/examples/CMakeLists.txt mysql-test/r/create-big.result mysql-test/r/ctype_binary.result mysql-test/r/ctype_cp1251.result mysql-test/r/ctype_latin1.result mysql-test/r/ctype_ucs.result mysql-test/r/ctype_utf8.result mysql-test/r/func_group.result mysql-test/r/mysqld--help-notwin.result mysql-test/r/mysqld--help-win.result mysql-test/r/mysqldump.result mysql-test/r/type_blob.result mysql-test/r/type_year.result mysql-test/suite/engines/iuds/r/delete_year.result mysql-test/suite/engines/iuds/r/insert_year.result mysql-test/suite/engines/iuds/r/update_year.result mysql-test/suite/funcs_1/r/innodb_views.result mysql-test/suite/funcs_1/r/is_columns_innodb.result mysql-test/suite/funcs_1/r/is_columns_memory.result mysql-test/suite/funcs_1/r/is_columns_myisam.result mysql-test/suite/funcs_1/r/is_columns_myisam_embedded.result mysql-test/suite/funcs_1/r/memory_views.result mysql-test/suite/funcs_1/r/myisam_views-big.result mysql-test/suite/funcs_1/r/storedproc.result mysql-test/suite/innodb/r/innodb_bug52745.result mysql-test/suite/perfschema/r/func_file_io.result mysql-test/suite/perfschema/r/query_cache.result mysql-test/suite/perfschema/t/disabled.def mysql-test/suite/perfschema/t/func_file_io.test mysql-test/suite/perfschema/t/query_cache.test mysql-test/suite/rpl/r/rpl_filter_tables_not_exist.result mysql-test/suite/rpl/r/rpl_log_pos.result mysql-test/suite/rpl/r/rpl_packet.result mysql-test/suite/rpl/r/rpl_trigger.result mysql-test/suite/rpl/t/rpl_filter_tables_not_exist.test mysql-test/suite/rpl/t/rpl_packet-slave.opt mysql-test/suite/rpl/t/rpl_packet.test mysql-test/t/create-big.test mysql-test/t/plugin_auth.test mysql-test/t/type_year.test mysys/mf_iocache2.c mysys/my_access.c mysys/my_write.c plugin/semisync/semisync.cc plugin/semisync/semisync.h plugin/semisync/semisync_master_plugin.cc plugin/semisync/semisync_slave_plugin.cc sql-common/client.c sql-common/client_plugin.c sql/CMakeLists.txt sql/field.cc sql/ha_partition.cc sql/handler.cc sql/item.cc sql/item_cmpfunc.cc sql/item_timefunc.cc sql/log.cc sql/log.h sql/log_event.cc sql/log_event.h sql/mysqld.cc sql/mysqld.h sql/opt_range.cc sql/protocol.cc sql/records.cc sql/rpl_utility.h sql/slave.cc sql/sql_acl.cc sql/sql_class.cc sql/sql_class.h sql/sql_connect.cc sql/sql_connect.h sql/sql_delete.cc sql/sql_parse.cc sql/sql_plugin.cc sql/sql_plugin.h sql/sql_profile.cc sql/sql_repl.cc sql/sql_select.cc sql/sql_show.cc sql/sql_table.cc sql/sql_yacc.yy sql/sys_vars.cc sql/sys_vars.h storage/archive/azio.c storage/archive/ha_archive.cc storage/innobase/btr/btr0btr.c storage/innobase/buf/buf0buf.c storage/innobase/buf/buf0lru.c storage/innobase/buf/buf0rea.c storage/innobase/dict/dict0dict.c storage/innobase/dict/dict0mem.c storage/innobase/fil/fil0fil.c storage/innobase/ha/ha0ha.c storage/innobase/handler/ha_innodb.cc storage/innobase/handler/handler0alter.cc storage/innobase/include/btr0btr.h storage/innobase/include/btr0types.h storage/innobase/include/buf0buf.h storage/innobase/include/buf0buf.ic storage/innobase/include/dict0dict.h storage/innobase/include/dict0dict.ic storage/innobase/include/log0log.h storage/innobase/include/os0file.h storage/innobase/include/srv0srv.h storage/innobase/include/trx0sys.h storage/innobase/mem/mem0dbg.c storage/innobase/os/os0file.c storage/innobase/page/page0zip.c storage/innobase/row/row0ins.c storage/innobase/row/row0vers.c storage/innobase/trx/trx0sys.c storage/innobase/ut/ut0dbg.c storage/innobase/ut/ut0ut.c storage/myisam/ft_boolean_search.c storage/myisam/ft_nlq_search.c strings/ctype-utf8.c strings/dtoa.c support-files/mysql.spec.sh tests/mysql_client_test.c vio/viosslfactories.c 3971 John David Duncan 2012-07-19 Fix for warnings in Club. modified: storage/ndb/memcache/src/Operation.cc 3970 John David Duncan 2012-07-17 Fix bugs in NDB+Memcached where multi-part keys were properly supported. added: mysql-test/suite/ndb_memcache/r/mpart_key.result mysql-test/suite/ndb_memcache/t/mpart_key.test modified: storage/ndb/memcache/include/Operation.h storage/ndb/memcache/src/ExternalValue.cc storage/ndb/memcache/src/Operation.cc storage/ndb/memcache/src/ndb_worker.cc 3969 John David Duncan 2012-07-17 Fix so that memcached no honors the NDB_CONNECTSTRING variable. Connectstring is: (1st choice) connecstring specified on the command line (2nd choice) NDB_CONNECTSTRING if set (3rd choice) default of localhost:1186 modified: storage/ndb/memcache/src/ndb_engine.c 3968 Mauritz Sundell 2012-07-12 [merge] Merge 7.1 -> 7.2 modified: storage/ndb/test/run-test/conf-ndb07.cnf 3967 magnus.blaudd@stripped 2012-07-06 [merge] Merge 7.1 -> 7.2 added: storage/ndb/cmake/ndb_check_mysql_include_file.cmake renamed: storage/ndb/src/common/util/ndb_opts.c => storage/ndb/src/common/util/ndb_opts.cpp modified: storage/ndb/include/ndb_config.h.in storage/ndb/include/util/ndb_opts.h storage/ndb/ndb_configure.cmake storage/ndb/src/common/util/CMakeLists.txt storage/ndb/src/kernel/main.cpp storage/ndb/src/mgmclient/main.cpp storage/ndb/src/mgmsrv/InitConfigFileParser.cpp storage/ndb/src/mgmsrv/main.cpp storage/ndb/test/ndbapi/testBitfield.cpp storage/ndb/test/ndbapi/test_event_multi_table.cpp storage/ndb/test/run-test/atrt.hpp storage/ndb/test/run-test/main.cpp storage/ndb/test/src/NDBT_Test.cpp storage/ndb/test/tools/connect.cpp storage/ndb/test/tools/hugoJoin.cpp storage/ndb/test/tools/log_listner.cpp storage/ndb/src/common/util/ndb_opts.cpp 3966 magnus.blaudd@stripped 2012-07-06 [merge] Merge 7.1 -> 7.2 modified: mysql-test/suite/ndb/r/ndb_blob_big.result mysql-test/suite/ndb/t/ndb_blob_big.test storage/ndb/src/mgmapi/CMakeLists.txt 3965 magnus.blaudd@stripped 2012-07-06 [merge] ndb - bump version to 7.2.8 modified: VERSION storage/ndb/VERSION 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 Diff too large for email (11444 lines, the limit is 10000). No bundle (reason: useless for push emails).