From: Martin Skold Date: June 7 2012 3:29pm Subject: bzr push into mysql-5.5-cluster-7.2 branch (Martin.Skold:3929 to 3930) List-Archive: http://lists.mysql.com/commits/144134 Message-Id: <20120607152934.6285B9F8D7F@quadfish> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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 Diff too large for email (12073 lines, the limit is 10000). No bundle (reason: useless for push emails).