From: magnus.blaudd Date: March 28 2012 7:27pm Subject: bzr push into mysql-trunk-cluster branch (magnus.blaudd:3458 to 3459) List-Archive: http://lists.mysql.com/commits/143347 Message-Id: <201203281927.q2SJR7ZY028297@acsmt358.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3459 magnus.blaudd@stripped 2012-03-28 ndb - MCP_GLOBAL_SCHEMA_LOCk impl uses hton_list_st, make it visible independednt on HAVE_NDB_BINLOG modified: sql/handler.cc 3458 magnus.blaudd@stripped 2012-03-28 [merge] Merge trunk -> trunk-cluster removed: mysql-test/suite/innodb/include/innodb-index.inc mysql-test/suite/rpl/t/rpl_change_master_bind.inc mysql-test/suite/sys_vars/r/pfs_digests_size.result mysql-test/suite/sys_vars/t/pfs_digests_size-master_basic.opt added: mysql-test/include/ctype_inet.inc mysql-test/r/bug12969156.result mysql-test/r/disabled_replication.result mysql-test/r/ds_mrr-big.result mysql-test/suite/innodb/r/innodb_bug11766634.result mysql-test/suite/innodb/t/innodb_bug11766634-master.opt mysql-test/suite/innodb/t/innodb_bug11766634.test mysql-test/suite/rpl/r/rpl_checksum_undef.result mysql-test/suite/rpl/r/rpl_stm_relay_ign_space.result mysql-test/suite/rpl/t/rpl_checksum_undef.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/suite/sys_vars/r/pfs_digests_size_basic.result mysql-test/suite/sys_vars/t/pfs_digests_size_basic-master.opt mysql-test/t/bug12969156-master.opt mysql-test/t/bug12969156.test mysql-test/t/disabled_replication-master.opt mysql-test/t/disabled_replication.test mysql-test/t/ds_mrr-big.test modified: .bzrignore BUILD/compile-dist VERSION client/mysqlbinlog.cc client/mysqldump.c configure.cmake extra/innochecksum.cc include/my_time.h include/mysql/psi/mysql_socket.h include/mysql/psi/psi.h include/mysql/psi/psi_abi_v0.h.pp include/mysql/psi/psi_abi_v1.h.pp include/mysql/psi/psi_abi_v2.h.pp include/mysql_com.h libmysqld/lib_sql.cc mysql-test/extra/rpl_tests/rpl_loaddata.test mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test mysql-test/include/check-testcase.test mysql-test/include/func_in.inc mysql-test/include/mrr_tests.inc mysql-test/include/mysqld--help.inc mysql-test/include/range.inc mysql-test/include/set_binlog_format_mixed.sql mysql-test/include/set_binlog_format_row.sql mysql-test/include/set_binlog_format_statement.sql mysql-test/include/subquery.inc mysql-test/include/subquery_sj.inc mysql-test/lib/My/Config.pm mysql-test/lib/My/File/Path.pm mysql-test/lib/My/Platform.pm mysql-test/lib/My/SafeProcess/Base.pm mysql-test/lib/My/SysInfo.pm mysql-test/lib/mtr_gprof.pl mysql-test/lib/mtr_io.pl mysql-test/lib/mtr_stress.pl mysql-test/lib/mtr_unique.pm mysql-test/lib/t/Base.t mysql-test/lib/t/Find.t mysql-test/lib/t/Options.t mysql-test/lib/t/Platform.t mysql-test/lib/t/SafeProcess.t mysql-test/lib/t/SafeProcessStress.pl mysql-test/lib/t/copytree.t mysql-test/lib/t/dummyd.pl mysql-test/lib/t/rmtree.t mysql-test/lib/t/testMyConfig.t mysql-test/lib/t/test_child.pl mysql-test/lib/v1/My/Config.pm mysql-test/lib/v1/mtr_cases.pl mysql-test/lib/v1/mtr_gcov.pl mysql-test/lib/v1/mtr_gprof.pl mysql-test/lib/v1/mtr_im.pl mysql-test/lib/v1/mtr_match.pl mysql-test/lib/v1/mtr_process.pl mysql-test/lib/v1/mtr_stress.pl mysql-test/lib/v1/mtr_timer.pl mysql-test/lib/v1/mtr_unique.pl mysql-test/mysql-test-run.pl mysql-test/r/cast.result mysql-test/r/create.result mysql-test/r/ctype_ascii.result mysql-test/r/ctype_big5.result mysql-test/r/ctype_binary.result mysql-test/r/ctype_cp1250_ch.result mysql-test/r/ctype_cp1251.result mysql-test/r/ctype_eucjpms.result mysql-test/r/ctype_euckr.result mysql-test/r/ctype_gb2312.result mysql-test/r/ctype_gbk.result mysql-test/r/ctype_latin1.result mysql-test/r/ctype_latin2.result mysql-test/r/ctype_sjis.result mysql-test/r/ctype_tis620.result mysql-test/r/ctype_ucs.result mysql-test/r/ctype_ujis.result mysql-test/r/ctype_utf8.result mysql-test/r/ctype_utf8mb4.result mysql-test/r/explain.result mysql-test/r/explain_json_all.result mysql-test/r/explain_json_none.result mysql-test/r/filesort_debug.result mysql-test/r/func_in_all.result mysql-test/r/func_in_icp.result mysql-test/r/func_in_icp_mrr.result mysql-test/r/func_in_mrr.result mysql-test/r/func_in_mrr_cost.result mysql-test/r/func_in_none.result mysql-test/r/get_diagnostics.result mysql-test/r/gis.result mysql-test/r/group_by.result mysql-test/r/innodb_explain_json_non_select_all.result mysql-test/r/innodb_explain_json_non_select_none.result mysql-test/r/innodb_explain_non_select_all.result mysql-test/r/innodb_explain_non_select_none.result mysql-test/r/innodb_mrr.result mysql-test/r/innodb_mrr_all.result mysql-test/r/innodb_mrr_cost.result mysql-test/r/innodb_mrr_cost_all.result mysql-test/r/innodb_mrr_cost_icp.result mysql-test/r/innodb_mrr_icp.result mysql-test/r/innodb_mrr_none.result mysql-test/r/innodb_mysql_lock.result mysql-test/r/myisam_explain_json_non_select_all.result mysql-test/r/myisam_explain_json_non_select_none.result mysql-test/r/myisam_explain_non_select_all.result mysql-test/r/myisam_explain_non_select_none.result mysql-test/r/myisam_mrr.result mysql-test/r/myisam_mrr_all.result mysql-test/r/myisam_mrr_cost.result mysql-test/r/myisam_mrr_cost_all.result mysql-test/r/myisam_mrr_cost_icp.result mysql-test/r/myisam_mrr_icp.result mysql-test/r/myisam_mrr_none.result mysql-test/r/mysqlcheck.result mysql-test/r/mysqld--help-notwin.result mysql-test/r/mysqld--help-win.result mysql-test/r/packet.result mysql-test/r/parser.result mysql-test/r/partition_error.result mysql-test/r/partition_exchange.result mysql-test/r/partition_innodb.result mysql-test/r/partition_pruning.result mysql-test/r/range_all.result mysql-test/r/range_icp.result mysql-test/r/range_icp_mrr.result mysql-test/r/range_mrr.result mysql-test/r/range_mrr_cost.result mysql-test/r/range_none.result mysql-test/r/read_only_innodb.result mysql-test/r/select_all.result mysql-test/r/select_all_bka.result mysql-test/r/select_all_bka_nixbnl.result mysql-test/r/select_icp_mrr.result mysql-test/r/select_icp_mrr_bka.result mysql-test/r/select_icp_mrr_bka_nixbnl.result mysql-test/r/select_none.result mysql-test/r/select_none_bka.result mysql-test/r/select_none_bka_nixbnl.result mysql-test/r/shm.result mysql-test/r/sp-destruct.result mysql-test/r/subquery_all.result mysql-test/r/subquery_all_bka.result mysql-test/r/subquery_all_bka_nixbnl.result mysql-test/r/subquery_nomat_nosj.result mysql-test/r/subquery_nomat_nosj_bka.result mysql-test/r/subquery_nomat_nosj_bka_nixbnl.result mysql-test/r/subquery_none.result mysql-test/r/subquery_none_bka.result mysql-test/r/subquery_none_bka_nixbnl.result mysql-test/r/subquery_sj_all.result mysql-test/r/subquery_sj_all_bka.result mysql-test/r/subquery_sj_all_bka_nixbnl.result mysql-test/r/subquery_sj_all_bkaunique.result mysql-test/r/subquery_sj_dupsweed.result mysql-test/r/subquery_sj_dupsweed_bka.result mysql-test/r/subquery_sj_dupsweed_bka_nixbnl.result mysql-test/r/subquery_sj_dupsweed_bkaunique.result mysql-test/r/subquery_sj_firstmatch.result mysql-test/r/subquery_sj_firstmatch_bka.result mysql-test/r/subquery_sj_firstmatch_bka_nixbnl.result mysql-test/r/subquery_sj_firstmatch_bkaunique.result mysql-test/r/subquery_sj_loosescan.result mysql-test/r/subquery_sj_loosescan_bka.result mysql-test/r/subquery_sj_loosescan_bka_nixbnl.result mysql-test/r/subquery_sj_loosescan_bkaunique.result mysql-test/r/subquery_sj_mat.result mysql-test/r/subquery_sj_mat_bka.result mysql-test/r/subquery_sj_mat_bka_nixbnl.result mysql-test/r/subquery_sj_mat_bkaunique.result mysql-test/r/subquery_sj_mat_nosj.result mysql-test/r/subquery_sj_none.result mysql-test/r/subquery_sj_none_bka.result mysql-test/r/subquery_sj_none_bka_nixbnl.result mysql-test/r/subquery_sj_none_bkaunique.result mysql-test/r/tablespace.result mysql-test/r/type_date.result mysql-test/r/type_datetime.result mysql-test/r/type_time.result mysql-test/r/type_timestamp.result mysql-test/r/variables-notembedded.result mysql-test/r/variables.result mysql-test/r/xa.result mysql-test/std_data/latin1.xml mysql-test/suite/funcs_1/r/is_tables_mysql.result mysql-test/suite/funcs_1/r/is_tables_mysql_embedded.result mysql-test/suite/innodb/r/innodb-autoinc.result mysql-test/suite/innodb/r/innodb-system-table-view.result mysql-test/suite/innodb/r/innodb.result mysql-test/suite/innodb/r/innodb_16k.result mysql-test/suite/innodb/r/innodb_bug-13628249.result mysql-test/suite/innodb/r/innodb_bug60049.result mysql-test/suite/innodb/r/innodb_prefix_index_liftedlimit.result mysql-test/suite/innodb/t/innodb-autoinc.test mysql-test/suite/innodb/t/innodb-system-table-view.test mysql-test/suite/innodb/t/innodb.test mysql-test/suite/innodb/t/innodb_16k.test mysql-test/suite/innodb/t/innodb_4k.test mysql-test/suite/innodb/t/innodb_8k.test mysql-test/suite/innodb/t/innodb_bug-13628249.test mysql-test/suite/innodb_fts/r/innodb_fts_misc.result mysql-test/suite/innodb_fts/t/innodb_fts_misc.test mysql-test/suite/perfschema/include/hostcache_dump.inc mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_allow.result mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_deny.result mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_allow.result mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_deny.result mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_allow.result mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_deny.result mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_allow.result mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_deny.result mysql-test/suite/perfschema/r/hostcache_ipv4_auth_plugin.result mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result mysql-test/suite/perfschema/r/hostcache_ipv4_format.result mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_allow.result mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_deny.result mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_allow.result mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_deny.result mysql-test/suite/perfschema/r/hostcache_ipv4_passwd.result mysql-test/suite/perfschema/r/hostcache_ipv4_ssl.result mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_allow.result mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_deny.result mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_allow.result mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_deny.result mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_allow.result mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_deny.result mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_allow.result mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_deny.result mysql-test/suite/perfschema/r/hostcache_ipv6_auth_plugin.result mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_allow.result mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_deny.result mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_allow.result mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_deny.result mysql-test/suite/perfschema/r/hostcache_ipv6_passwd.result mysql-test/suite/perfschema/r/hostcache_ipv6_ssl.result mysql-test/suite/perfschema/r/hostcache_peer_addr.result mysql-test/suite/perfschema/r/pfs_upgrade.result mysql-test/suite/perfschema/r/schema.result mysql-test/suite/perfschema/r/table_schema.result mysql-test/suite/perfschema/t/digest_table_full-master.opt mysql-test/suite/perfschema/t/no_threads-master.opt mysql-test/suite/perfschema/t/start_server_no_digests-master.opt mysql-test/suite/perfschema/t/statement_digest_consumers-master.opt mysql-test/suite/perfschema/t/statement_digest_consumers2-master.opt mysql-test/suite/rpl/r/rpl_alter_repository.result mysql-test/suite/rpl/r/rpl_corruption.result mysql-test/suite/rpl/r/rpl_extra_row_data.result mysql-test/suite/rpl/r/rpl_heartbeat.result mysql-test/suite/rpl/r/rpl_heartbeat_basic.result mysql-test/suite/rpl/r/rpl_loaddata.result mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result mysql-test/suite/rpl/r/rpl_mixed_mts_crash_safe.result mysql-test/suite/rpl/r/rpl_mixed_mts_rec_crash_safe.result mysql-test/suite/rpl/r/rpl_mixed_mts_rec_crash_safe_checksum.result mysql-test/suite/rpl/r/rpl_mts_debug.result mysql-test/suite/rpl/r/rpl_packet.result mysql-test/suite/rpl/r/rpl_parallel_start_stop.result mysql-test/suite/rpl/r/rpl_report_port.result mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result mysql-test/suite/rpl/r/rpl_row_crash_safe.result mysql-test/suite/rpl/r/rpl_row_mts_crash_safe.result mysql-test/suite/rpl/r/rpl_row_mts_rec_crash_safe.result mysql-test/suite/rpl/r/rpl_stm_EE_err2.result mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result mysql-test/suite/rpl/r/rpl_stm_loaddata_concurrent.result mysql-test/suite/rpl/r/rpl_stm_mixed_crash_safe.result mysql-test/suite/rpl/r/rpl_stm_mts_crash_safe.result mysql-test/suite/rpl/r/rpl_stm_mts_rec_crash_safe.result mysql-test/suite/rpl/t/rpl_alter_repository.test mysql-test/suite/rpl/t/rpl_binlog_errors.test mysql-test/suite/rpl/t/rpl_corruption.test mysql-test/suite/rpl/t/rpl_deadlock_innodb.test mysql-test/suite/rpl/t/rpl_mts_debug.test mysql-test/suite/rpl/t/rpl_parallel_start_stop.test mysql-test/suite/rpl/t/rpl_report_port.test mysql-test/suite/sys_vars/r/max_allowed_packet_basic.result mysql-test/suite/sys_vars/r/max_allowed_packet_func.result mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic.result mysql-test/suite/sys_vars/r/max_binlog_stmt_cache_size_basic.result mysql-test/suite/sys_vars/r/slave_checkpoint_group_basic.result mysql-test/t/bootstrap-master.opt mysql-test/t/create.test mysql-test/t/ctype_ascii.test mysql-test/t/ctype_big5.test mysql-test/t/ctype_binary.test mysql-test/t/ctype_cp1250_ch.test mysql-test/t/ctype_cp1251.test mysql-test/t/ctype_eucjpms.test mysql-test/t/ctype_euckr.test mysql-test/t/ctype_gb2312.test mysql-test/t/ctype_gbk.test mysql-test/t/ctype_latin1.test mysql-test/t/ctype_latin2.test mysql-test/t/ctype_sjis.test mysql-test/t/ctype_tis620.test mysql-test/t/ctype_ucs.test mysql-test/t/ctype_ujis.test mysql-test/t/ctype_utf8.test mysql-test/t/ctype_utf8mb4.test mysql-test/t/filesort_debug.test mysql-test/t/group_by.test mysql-test/t/innodb_ignore_builtin-master.opt mysql-test/t/innodb_mysql_lock.test mysql-test/t/myisam-blob-master.opt mysql-test/t/mysql_embedded-master.opt mysql-test/t/parser.test mysql-test/t/partition_error.test mysql-test/t/partition_innodb.test mysql-test/t/tablespace.test mysql-test/t/type_date.test mysql-test/t/type_datetime.test mysql-test/t/type_timestamp.test mysql-test/t/warnings-master.opt mysql-test/t/xa.test mysys/my_lib.c mysys/stacktrace.c plugin/daemon_example/daemon_example.cc scripts/mysql_system_tables.sql scripts/mysqld_safe.sh sql-bench/as3ap.sh sql-bench/bench-count-distinct.sh sql-bench/bench-init.pl.sh sql-bench/compare-results.sh sql-bench/copy-db.sh sql-bench/crash-me.sh sql-bench/run-all-tests.sh sql-bench/server-cfg.sh sql-bench/test-ATIS.sh sql-bench/test-alter-table.sh sql-bench/test-big-tables.sh sql-bench/test-connect.sh sql-bench/test-create.sh sql-bench/test-insert.sh sql-bench/test-select.sh sql-bench/test-transactions.sh sql-bench/test-wisconsin.sh sql-common/my_time.c sql/binlog.cc sql/binlog.h sql/field.cc sql/filesort.cc sql/filesort_utils.h sql/ha_ndbcluster_binlog.cc sql/ha_partition.cc sql/ha_partition.h sql/handler.cc sql/handler.h sql/item.cc sql/item.h sql/item_cmpfunc.cc sql/item_func.cc sql/item_geofunc.cc sql/item_inetfunc.cc sql/item_strfunc.cc sql/item_xmlfunc.cc sql/log.h sql/log_event.cc sql/log_event.h sql/mysqld.cc sql/mysqld.h sql/net_serv.cc sql/opt_explain_json.cc sql/opt_range.cc sql/opt_trace_context.h sql/protocol.cc sql/rpl_info.h sql/rpl_info_factory.cc sql/rpl_injector.cc sql/rpl_injector.h sql/rpl_master.cc sql/rpl_master.h sql/rpl_reporting.cc sql/rpl_rli.cc sql/rpl_rli.h sql/rpl_rli_pdb.cc sql/rpl_slave.cc sql/rpl_slave.h sql/share/errmsg-utf8.txt sql/signal_handler.cc sql/sp.cc sql/sp_head.cc sql/sp_head.h sql/sp_pcontext.h sql/sp_rcontext.cc sql/sp_rcontext.h sql/sql_acl.cc sql/sql_class.cc sql/sql_class.h sql/sql_error.cc sql/sql_error.h sql/sql_get_diagnostics.cc sql/sql_insert.cc sql/sql_lex.cc sql/sql_lex.h sql/sql_load.cc sql/sql_optimizer.cc sql/sql_optimizer.h sql/sql_parse.cc sql/sql_prepare.cc sql/sql_reload.cc sql/sql_show.cc sql/sql_signal.cc sql/sql_table.cc sql/sql_table.h sql/sql_trigger.cc sql/sql_trigger.h sql/sql_update.cc sql/sql_view.cc sql/sql_yacc.yy sql/sys_vars.cc sql/table.cc sql/transaction.cc sql/unireg.cc storage/federated/ha_federated.h storage/innobase/btr/btr0pcur.cc storage/innobase/buf/buf0buf.cc storage/innobase/buf/buf0dump.cc storage/innobase/fil/fil0fil.cc storage/innobase/fsp/fsp0fsp.cc storage/innobase/fts/fts0fts.cc storage/innobase/handler/ha_innodb.cc storage/innobase/ibuf/ibuf0ibuf.cc storage/innobase/include/fil0fil.h storage/innobase/include/mtr0mtr.ic storage/innobase/include/sync0rw.h storage/innobase/include/sync0rw.ic storage/innobase/include/trx0purge.h storage/innobase/include/trx0trx.h storage/innobase/include/ut0vec.ic storage/innobase/lock/lock0lock.cc storage/innobase/row/row0mysql.cc storage/innobase/row/row0purge.cc storage/innobase/srv/srv0srv.cc storage/innobase/srv/srv0start.cc storage/innobase/trx/trx0purge.cc storage/innobase/trx/trx0rec.cc storage/innobase/trx/trx0trx.cc storage/innobase/ut/ut0crc32.cc storage/myisam/ha_myisam.cc storage/myisam/mi_dynrec.c storage/perfschema/pfs.cc storage/perfschema/pfs_instr.cc storage/perfschema/pfs_instr.h storage/perfschema/pfs_instr_class.cc storage/perfschema/pfs_instr_class.h storage/perfschema/pfs_stat.h storage/perfschema/pfs_visitor.cc storage/perfschema/table_events_waits.cc storage/perfschema/table_helper.cc storage/perfschema/table_host_cache.cc storage/perfschema/table_os_global_by_type.cc storage/perfschema/table_tiws_by_index_usage.cc unittest/gunit/opt_range-t.cc vio/viosslfactories.c win/create_def_file.js === modified file 'sql/handler.cc' --- a/sql/handler.cc 2012-03-28 18:48:25 +0000 +++ b/sql/handler.cc 2012-03-28 19:25:44 +0000 @@ -4385,7 +4385,11 @@ int ha_make_pushed_joins(THD *thd, AQP:: #endif +/* + MCP_GLOBAL_SCHEMA_LOCK uses hton_list_st, make it visible + independent on HAVE_NDB_BINLOG #ifdef HAVE_NDB_BINLOG +*/ /* TODO: change this into a dynamic struct List does not work as @@ -4399,6 +4403,7 @@ struct hton_list_st uint sz; }; +#ifdef HAVE_NDB_BINLOG // MCP_GLOBAL_SCHEMA_LOCK struct binlog_func_st { enum_binlog_func fn; No bundle (reason: useless for push emails).