From: magnus.blaudd Date: November 18 2011 12:03pm Subject: bzr push into mysql-trunk branch (magnus.blaudd:3435 to 3437) List-Archive: http://lists.mysql.com/commits/142062 Message-Id: <201111181203.pAIC3MrW030732@acsmt357.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3437 magnus.blaudd@stripped 2011-11-18 ndb - update trunck-cluster-base with latest compile-cluster script modified: storage/ndb/compile-cluster 3436 magnus.blaudd@stripped 2011-11-18 [merge] Merge trunk(as of when 5.5.17 was merged in) into trunk-cluster-base removed: mysql-test/collections/default.release mysql-test/extra/rpl_tests/rpl_insert_duplicate.test mysql-test/r/join_cache_bka_nobnl.result mysql-test/r/join_nested_bka_nobnl.result mysql-test/r/join_outer_bka_nobnl.result mysql-test/r/select_all_bka_nobnl.result mysql-test/r/select_icp_mrr_bka_nobnl.result mysql-test/r/select_none_bka_nobnl.result mysql-test/r/subquery_all_bka_nobnl.result mysql-test/r/subquery_nomat_nosj_bka_nobnl.result mysql-test/r/subquery_none_bka_nobnl.result mysql-test/r/subquery_sj_all_bka_nobnl.result mysql-test/r/subquery_sj_dupsweed_bka_nobnl.result mysql-test/r/subquery_sj_firstmatch_bka_nobnl.result mysql-test/r/subquery_sj_innodb_all_bka_nobnl.result mysql-test/r/subquery_sj_innodb_none_bka_nobnl.result mysql-test/r/subquery_sj_loosescan_bka_nobnl.result mysql-test/r/subquery_sj_mat_bka_nobnl.result mysql-test/r/subquery_sj_none_bka_nobnl.result mysql-test/suite/rpl/r/rpl_insert_duplicate.result mysql-test/suite/rpl/r/rpl_insert_select.result mysql-test/suite/rpl/t/rpl_insert_duplicate.test mysql-test/suite/rpl/t/rpl_insert_select.test mysql-test/t/join_cache_bka_nobnl.test mysql-test/t/join_nested_bka_nobnl.test mysql-test/t/join_outer_bka_nobnl.test mysql-test/t/select_all_bka_nobnl.test mysql-test/t/select_icp_mrr_bka_nobnl.test mysql-test/t/select_none_bka_nobnl.test mysql-test/t/subquery_all_bka_nobnl.test mysql-test/t/subquery_nomat_nosj_bka_nobnl.test mysql-test/t/subquery_none_bka_nobnl.test mysql-test/t/subquery_sj_all_bka_nobnl.test mysql-test/t/subquery_sj_dupsweed_bka_nobnl.test mysql-test/t/subquery_sj_firstmatch_bka_nobnl.test mysql-test/t/subquery_sj_innodb_all_bka_nobnl.test mysql-test/t/subquery_sj_innodb_none_bka_nobnl.test mysql-test/t/subquery_sj_loosescan_bka_nobnl.test mysql-test/t/subquery_sj_mat_bka_nobnl.test mysql-test/t/subquery_sj_none_bka_nobnl.test added: cmd-line-utils/libedit/chartype.c cmd-line-utils/libedit/chartype.h cmd-line-utils/libedit/eln.c cmd-line-utils/libedit/historyn.c cmd-line-utils/libedit/np/wcsdup.c cmd-line-utils/libedit/tokenizern.c mysql-test/collections/default.release.in mysql-test/r/get_diagnostics.result mysql-test/r/join_cache_bka_nixbnl.result mysql-test/r/join_nested_bka_nixbnl.result mysql-test/r/join_outer_bka_nixbnl.result mysql-test/r/select_all_bka_nixbnl.result mysql-test/r/select_icp_mrr_bka_nixbnl.result mysql-test/r/select_none_bka_nixbnl.result mysql-test/r/subquery_all_bka_nixbnl.result mysql-test/r/subquery_nomat_nosj_bka_nixbnl.result mysql-test/r/subquery_none_bka_nixbnl.result mysql-test/r/subquery_sj_all_bka_nixbnl.result mysql-test/r/subquery_sj_dupsweed_bka_nixbnl.result mysql-test/r/subquery_sj_firstmatch_bka_nixbnl.result mysql-test/r/subquery_sj_innodb_all_bka_nixbnl.result mysql-test/r/subquery_sj_innodb_none_bka_nixbnl.result mysql-test/r/subquery_sj_loosescan_bka_nixbnl.result mysql-test/r/subquery_sj_mat_bka_nixbnl.result mysql-test/r/subquery_sj_none_bka_nixbnl.result mysql-test/std_data/bug48633.ARM mysql-test/std_data/bug48633.ARZ mysql-test/std_data/bug48633.frm mysql-test/suite/innodb/t/innodb_bug47167-master.opt mysql-test/suite/innodb/t/innodb_file_format-master.opt mysql-test/suite/rpl/r/rpl_alter_repository.result mysql-test/suite/rpl/r/rpl_general_log.result mysql-test/suite/rpl/r/rpl_replicate_rewrite_db.result mysql-test/suite/rpl/t/rpl_alter_repository.test mysql-test/suite/rpl/t/rpl_general_log.test mysql-test/suite/rpl/t/rpl_replicate_rewrite_db.test mysql-test/suite/stress/t/wrapper.test mysql-test/suite/sys_vars/r/innodb_analyze_is_persistent_basic.result mysql-test/suite/sys_vars/r/innodb_monitor_disable_basic.result mysql-test/suite/sys_vars/r/innodb_monitor_enable_basic.result mysql-test/suite/sys_vars/r/innodb_monitor_reset_all_basic.result mysql-test/suite/sys_vars/r/innodb_monitor_reset_basic.result mysql-test/suite/sys_vars/r/innodb_print_all_deadlocks_basic.result mysql-test/suite/sys_vars/r/innodb_stats_persistent_sample_pages_basic.result mysql-test/suite/sys_vars/r/innodb_stats_transient_sample_pages_basic.result mysql-test/suite/sys_vars/r/innodb_sync_array_size_basic.result mysql-test/suite/sys_vars/t/innodb_analyze_is_persistent_basic.test mysql-test/suite/sys_vars/t/innodb_file_format_max_basic-master.opt mysql-test/suite/sys_vars/t/innodb_monitor_disable_basic.test mysql-test/suite/sys_vars/t/innodb_monitor_enable_basic.test mysql-test/suite/sys_vars/t/innodb_monitor_reset_all_basic.test mysql-test/suite/sys_vars/t/innodb_monitor_reset_basic.test mysql-test/suite/sys_vars/t/innodb_print_all_deadlocks_basic.test mysql-test/suite/sys_vars/t/innodb_stats_persistent_sample_pages_basic.test mysql-test/suite/sys_vars/t/innodb_stats_transient_sample_pages_basic.test mysql-test/suite/sys_vars/t/innodb_sync_array_size_basic.test mysql-test/t/get_diagnostics.test mysql-test/t/join_cache_bka_nixbnl.test mysql-test/t/join_nested_bka_nixbnl.test mysql-test/t/join_outer_bka_nixbnl.test mysql-test/t/select_all_bka_nixbnl.test mysql-test/t/select_icp_mrr_bka_nixbnl.test mysql-test/t/select_none_bka_nixbnl.test mysql-test/t/subquery_all_bka_nixbnl.test mysql-test/t/subquery_nomat_nosj_bka_nixbnl.test mysql-test/t/subquery_none_bka_nixbnl.test mysql-test/t/subquery_sj_all_bka_nixbnl.test mysql-test/t/subquery_sj_dupsweed_bka_nixbnl.test mysql-test/t/subquery_sj_firstmatch_bka_nixbnl.test mysql-test/t/subquery_sj_innodb_all_bka_nixbnl.test mysql-test/t/subquery_sj_innodb_none_bka_nixbnl.test mysql-test/t/subquery_sj_loosescan_bka_nixbnl.test mysql-test/t/subquery_sj_mat_bka_nixbnl.test mysql-test/t/subquery_sj_none_bka_nixbnl.test sql/sql_get_diagnostics.cc sql/sql_get_diagnostics.h unittest/gunit/get_diagnostics-t.cc renamed: cmd-line-utils/libedit/el_term.h => cmd-line-utils/libedit/el_terminal.h cmd-line-utils/libedit/key.c => cmd-line-utils/libedit/keymacro.c cmd-line-utils/libedit/key.h => cmd-line-utils/libedit/keymacro.h cmd-line-utils/libedit/term.c => cmd-line-utils/libedit/terminal.c modified: .bzrignore VERSION client/mysql_plugin.c client/mysqldump.c client/mysqltest.cc cmake/create_initial_db.cmake.in cmd-line-utils/libedit/CMakeLists.txt cmd-line-utils/libedit/README cmd-line-utils/libedit/chared.c cmd-line-utils/libedit/chared.h cmd-line-utils/libedit/common.c cmd-line-utils/libedit/config.h cmd-line-utils/libedit/el.c cmd-line-utils/libedit/el.h cmd-line-utils/libedit/emacs.c cmd-line-utils/libedit/filecomplete.c cmd-line-utils/libedit/filecomplete.h cmd-line-utils/libedit/hist.c cmd-line-utils/libedit/hist.h cmd-line-utils/libedit/histedit.h cmd-line-utils/libedit/history.c cmd-line-utils/libedit/makelist.sh cmd-line-utils/libedit/map.c cmd-line-utils/libedit/map.h cmd-line-utils/libedit/np/strlcpy.c cmd-line-utils/libedit/np/unvis.c cmd-line-utils/libedit/np/vis.c cmd-line-utils/libedit/np/vis.h cmd-line-utils/libedit/parse.c cmd-line-utils/libedit/parse.h cmd-line-utils/libedit/prompt.c cmd-line-utils/libedit/prompt.h cmd-line-utils/libedit/read.c cmd-line-utils/libedit/read.h cmd-line-utils/libedit/readline.c cmd-line-utils/libedit/readline/readline.h cmd-line-utils/libedit/refresh.c cmd-line-utils/libedit/refresh.h cmd-line-utils/libedit/search.c cmd-line-utils/libedit/search.h cmd-line-utils/libedit/sig.c cmd-line-utils/libedit/sig.h cmd-line-utils/libedit/sys.h cmd-line-utils/libedit/tokenizer.c cmd-line-utils/libedit/tty.c cmd-line-utils/libedit/tty.h cmd-line-utils/libedit/vi.c include/heap.h include/my_pthread.h libmysql/authentication_win/handshake_client.cc libmysqld/lib_sql.cc man/CMakeLists.txt mysql-test/CMakeLists.txt mysql-test/collections/README mysql-test/collections/default.experimental mysql-test/extra/rpl_tests/rpl_insert_id.test mysql-test/extra/rpl_tests/rpl_insert_ignore.test mysql-test/extra/rpl_tests/rpl_loaddata.test mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test mysql-test/include/commit.inc mysql-test/include/explain_non_select.inc mysql-test/include/icp_tests.inc mysql-test/include/mrr_tests.inc mysql-test/include/mtr_check.sql mysql-test/include/subquery.inc mysql-test/include/subquery_sj.inc mysql-test/lib/My/CoreDump.pm mysql-test/mysql-stress-test.pl mysql-test/mysql-test-run.pl mysql-test/r/archive.result mysql-test/r/cast.result mysql-test/r/commit_1innodb.result mysql-test/r/ctype_utf16.result mysql-test/r/ctype_utf32.result mysql-test/r/ctype_utf8.result mysql-test/r/derived.result mysql-test/r/error_simulation.result mysql-test/r/explain.result mysql-test/r/fulltext.result mysql-test/r/func_str.result mysql-test/r/group_by.result mysql-test/r/having.result mysql-test/r/heap.result mysql-test/r/index_merge_myisam.result mysql-test/r/innodb_explain_non_select_all.result mysql-test/r/innodb_explain_non_select_none.result mysql-test/r/innodb_icp.result mysql-test/r/innodb_icp_all.result mysql-test/r/innodb_icp_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/join_cache_bka.result mysql-test/r/join_cache_bkaunique.result mysql-test/r/join_cache_nojb.result mysql-test/r/join_nested_bka.result mysql-test/r/join_outer.result mysql-test/r/join_outer_bka.result mysql-test/r/myisam_explain_non_select_all.result mysql-test/r/myisam_explain_non_select_none.result mysql-test/r/myisam_icp.result mysql-test/r/myisam_icp_all.result mysql-test/r/myisam_icp_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/mysql_plugin.result mysql-test/r/mysqld--help-notwin.result mysql-test/r/mysqld--help-win.result mysql-test/r/mysqltest.result mysql-test/r/optimizer_switch.result mysql-test/r/packet.result mysql-test/r/partition.result mysql-test/r/partition_innodb.result mysql-test/r/partition_innodb_plugin.result mysql-test/r/partition_myisam.result mysql-test/r/ps.result mysql-test/r/read_only_innodb.result mysql-test/r/select_all_bka.result mysql-test/r/select_icp_mrr_bka.result mysql-test/r/select_none_bka.result mysql-test/r/shm.result mysql-test/r/show_check.result mysql-test/r/signal.result mysql-test/r/sp-code.result mysql-test/r/sp-error.result mysql-test/r/sp.result mysql-test/r/subquery_all.result mysql-test/r/subquery_all_bka.result mysql-test/r/subquery_mat_none.result mysql-test/r/subquery_nomat_nosj.result mysql-test/r/subquery_nomat_nosj_bka.result mysql-test/r/subquery_none.result mysql-test/r/subquery_none_bka.result mysql-test/r/subquery_sj_all.result mysql-test/r/subquery_sj_all_bka.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_bkaunique.result mysql-test/r/subquery_sj_firstmatch.result mysql-test/r/subquery_sj_firstmatch_bka.result mysql-test/r/subquery_sj_firstmatch_bkaunique.result mysql-test/r/subquery_sj_innodb_all_bka.result mysql-test/r/subquery_sj_innodb_all_bkaunique.result mysql-test/r/subquery_sj_innodb_none_bka.result mysql-test/r/subquery_sj_innodb_none_bkaunique.result mysql-test/r/subquery_sj_loosescan.result mysql-test/r/subquery_sj_loosescan_bka.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_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_bkaunique.result mysql-test/r/variables-notembedded.result mysql-test/r/variables.result mysql-test/suite/binlog/r/binlog_stm_blackhole.result mysql-test/suite/binlog/r/binlog_unsafe.result mysql-test/suite/binlog/t/binlog_unsafe.test mysql-test/suite/engines/funcs/r/de_calendar_range.result mysql-test/suite/engines/funcs/r/in_calendar_2_unique_constraints_duplicate_update.result mysql-test/suite/engines/funcs/r/in_calendar_pk_constraint_duplicate_update.result mysql-test/suite/engines/funcs/r/in_calendar_pk_constraint_error.result mysql-test/suite/engines/funcs/r/in_calendar_pk_constraint_ignore.result mysql-test/suite/engines/funcs/r/in_calendar_unique_constraint_duplicate_update.result mysql-test/suite/engines/funcs/r/in_calendar_unique_constraint_error.result mysql-test/suite/engines/funcs/r/in_calendar_unique_constraint_ignore.result mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_pk_constraint_duplicate_update.result mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_pk_constraint_error.result mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_pk_constraint_ignore.result mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_unique_constraint_duplicate_update.result mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_unique_constraint_error.result mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_unique_constraint_ignore.result mysql-test/suite/engines/funcs/r/in_multicolumn_number_pk_constraint_duplicate_update.result mysql-test/suite/engines/funcs/r/up_calendar_range.result mysql-test/suite/engines/funcs/t/de_calendar_range.test mysql-test/suite/engines/funcs/t/in_calendar_2_unique_constraints_duplicate_update.test mysql-test/suite/engines/funcs/t/in_calendar_pk_constraint_duplicate_update.test mysql-test/suite/engines/funcs/t/in_calendar_pk_constraint_error.test mysql-test/suite/engines/funcs/t/in_calendar_pk_constraint_ignore.test mysql-test/suite/engines/funcs/t/in_calendar_unique_constraint_duplicate_update.test mysql-test/suite/engines/funcs/t/in_calendar_unique_constraint_error.test mysql-test/suite/engines/funcs/t/in_calendar_unique_constraint_ignore.test mysql-test/suite/engines/funcs/t/in_multicolumn_calendar_pk_constraint_duplicate_update.test mysql-test/suite/engines/funcs/t/in_multicolumn_calendar_pk_constraint_error.test mysql-test/suite/engines/funcs/t/in_multicolumn_calendar_pk_constraint_ignore.test mysql-test/suite/engines/funcs/t/in_multicolumn_calendar_unique_constraint_duplicate_update.test mysql-test/suite/engines/funcs/t/in_multicolumn_calendar_unique_constraint_error.test mysql-test/suite/engines/funcs/t/in_multicolumn_calendar_unique_constraint_ignore.test mysql-test/suite/engines/funcs/t/in_multicolumn_number_pk_constraint_duplicate_update.test mysql-test/suite/engines/funcs/t/up_calendar_range.test mysql-test/suite/federated/federated_plugin-master.opt mysql-test/suite/federated/federated_plugin.result mysql-test/suite/federated/federated_plugin.test mysql-test/suite/funcs_1/r/innodb_storedproc_02.result mysql-test/suite/funcs_1/r/memory_storedproc_02.result mysql-test/suite/funcs_1/r/myisam_storedproc_02.result mysql-test/suite/funcs_1/r/storedproc.result mysql-test/suite/innodb/r/innodb_bug52745.result mysql-test/suite/innodb/r/innodb_bug53591.result mysql-test/suite/innodb/r/innodb_file_format.result mysql-test/suite/innodb/r/innodb_index_large_prefix.result mysql-test/suite/innodb/r/innodb_mysql.result mysql-test/suite/innodb/r/innodb_prefix_index_liftedlimit.result mysql-test/suite/innodb/r/innodb_prefix_index_restart_server.result mysql-test/suite/innodb/t/innodb-autoinc-44030.test mysql-test/suite/innodb/t/innodb-autoinc.test mysql-test/suite/innodb/t/innodb-create-options.test mysql-test/suite/innodb/t/innodb-index.test mysql-test/suite/innodb/t/innodb-zip.test mysql-test/suite/innodb/t/innodb_bug36172.test mysql-test/suite/innodb/t/innodb_bug52745.test mysql-test/suite/innodb/t/innodb_bug53591.test mysql-test/suite/innodb/t/innodb_bug56680.test mysql-test/suite/innodb/t/innodb_file_format.test mysql-test/suite/innodb/t/innodb_index_large_prefix.test mysql-test/suite/innodb/t/innodb_prefix_index_liftedlimit.test mysql-test/suite/innodb/t/innodb_prefix_index_restart_server.test mysql-test/suite/opt_trace/include/general.inc mysql-test/suite/opt_trace/include/general2.inc mysql-test/suite/opt_trace/include/range.inc mysql-test/suite/opt_trace/include/subquery.inc mysql-test/suite/opt_trace/r/bugs_no_prot_all.result mysql-test/suite/opt_trace/r/bugs_no_prot_none.result mysql-test/suite/opt_trace/r/bugs_ps_prot_all.result mysql-test/suite/opt_trace/r/bugs_ps_prot_none.result mysql-test/suite/opt_trace/r/charset.result mysql-test/suite/opt_trace/r/filesort_pq.result mysql-test/suite/opt_trace/r/general2_no_prot.result mysql-test/suite/opt_trace/r/general2_ps_prot.result mysql-test/suite/opt_trace/r/general_no_prot_all.result mysql-test/suite/opt_trace/r/general_no_prot_none.result mysql-test/suite/opt_trace/r/general_ps_prot_all.result mysql-test/suite/opt_trace/r/general_ps_prot_none.result mysql-test/suite/opt_trace/r/range_no_prot.result mysql-test/suite/opt_trace/r/range_ps_prot.result mysql-test/suite/opt_trace/r/security_no_prot.result mysql-test/suite/opt_trace/r/security_ps_prot.result mysql-test/suite/opt_trace/r/subquery_no_prot.result mysql-test/suite/opt_trace/r/subquery_ps_prot.result mysql-test/suite/perfschema/r/ortho_iter.result mysql-test/suite/perfschema/r/privilege_table_io.result mysql-test/suite/perfschema/r/start_server_innodb.result mysql-test/suite/perfschema/r/start_server_no_account.result mysql-test/suite/perfschema/r/start_server_no_cond_class.result mysql-test/suite/perfschema/r/start_server_no_cond_inst.result mysql-test/suite/perfschema/r/start_server_no_file_class.result mysql-test/suite/perfschema/r/start_server_no_file_inst.result mysql-test/suite/perfschema/r/start_server_no_host.result mysql-test/suite/perfschema/r/start_server_no_mutex_class.result mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result mysql-test/suite/perfschema/r/start_server_no_setup_actors.result mysql-test/suite/perfschema/r/start_server_no_setup_objects.result mysql-test/suite/perfschema/r/start_server_no_socket_class.result mysql-test/suite/perfschema/r/start_server_no_socket_inst.result mysql-test/suite/perfschema/r/start_server_no_stage_class.result mysql-test/suite/perfschema/r/start_server_no_stages_history.result mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result mysql-test/suite/perfschema/r/start_server_no_statements_history.result mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result mysql-test/suite/perfschema/r/start_server_no_table_hdl.result mysql-test/suite/perfschema/r/start_server_no_table_inst.result mysql-test/suite/perfschema/r/start_server_no_thread_class.result mysql-test/suite/perfschema/r/start_server_no_thread_inst.result mysql-test/suite/perfschema/r/start_server_no_user.result mysql-test/suite/perfschema/r/start_server_no_waits_history.result mysql-test/suite/perfschema/r/start_server_no_waits_history_long.result mysql-test/suite/perfschema/r/start_server_off.result mysql-test/suite/perfschema/r/start_server_on.result mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result mysql-test/suite/perfschema/r/table_aggregate_off.result mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result mysql-test/suite/rpl/r/rpl_checksum.result mysql-test/suite/rpl/r/rpl_insert_ignore.result mysql-test/suite/rpl/r/rpl_known_bugs_detection.result mysql-test/suite/rpl/r/rpl_loaddata.result mysql-test/suite/rpl/r/rpl_log_pos.result mysql-test/suite/rpl/r/rpl_manual_change_index_file.result mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result mysql-test/suite/rpl/r/rpl_packet.result mysql-test/suite/rpl/r/rpl_parallel_ddl.result mysql-test/suite/rpl/r/rpl_parallel_start_stop.result mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result mysql-test/suite/rpl/r/rpl_row_event_max_size.result mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.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_user_variables.result mysql-test/suite/rpl/t/rpl_known_bugs_detection.test mysql-test/suite/rpl/t/rpl_manual_change_index_file.test mysql-test/suite/rpl/t/rpl_packet.test mysql-test/suite/rpl/t/rpl_parallel_ddl.test mysql-test/suite/rpl/t/rpl_parallel_start_stop.test mysql-test/suite/rpl/t/rpl_parallel_switch_sequential.test mysql-test/suite/rpl/t/rpl_rotate_logs.test mysql-test/suite/rpl/t/rpl_row_event_max_size.test mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test mysql-test/suite/rpl/t/rpl_stm_user_variables.test mysql-test/suite/sys_vars/r/all_vars.result 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_stmt_cache_size_basic.result mysql-test/suite/sys_vars/r/optimizer_switch_basic.result mysql-test/t/archive.test mysql-test/t/ctype_utf16.test mysql-test/t/ctype_utf32.test mysql-test/t/ctype_utf8.test mysql-test/t/derived.test mysql-test/t/error_simulation.test mysql-test/t/file_contents.test mysql-test/t/fulltext.test mysql-test/t/func_str.test mysql-test/t/group_by.test mysql-test/t/heap.test mysql-test/t/join_cache_bka.test mysql-test/t/join_cache_bkaunique.test mysql-test/t/join_cache_nojb.test mysql-test/t/join_nested_bka.test mysql-test/t/join_outer.test mysql-test/t/join_outer_bka.test mysql-test/t/mysql_plugin.test mysql-test/t/mysqld--defaults-file.test mysql-test/t/mysqltest.test mysql-test/t/partition.test mysql-test/t/partition_innodb.test mysql-test/t/partition_innodb_plugin.test mysql-test/t/partition_myisam.test mysql-test/t/ps.test mysql-test/t/select_all_bka.test mysql-test/t/select_icp_mrr_bka.test mysql-test/t/select_none_bka.test mysql-test/t/show_check.test mysql-test/t/sp-error.test mysql-test/t/sp.test mysql-test/t/subquery_all_bka.test mysql-test/t/subquery_nomat_nosj_bka.test mysql-test/t/subquery_none_bka.test mysql-test/t/subquery_sj_all_bka.test mysql-test/t/subquery_sj_all_bkaunique.test mysql-test/t/subquery_sj_dupsweed_bka.test mysql-test/t/subquery_sj_dupsweed_bkaunique.test mysql-test/t/subquery_sj_firstmatch.test mysql-test/t/subquery_sj_firstmatch_bka.test mysql-test/t/subquery_sj_firstmatch_bkaunique.test mysql-test/t/subquery_sj_innodb_all_bka.test mysql-test/t/subquery_sj_innodb_all_bkaunique.test mysql-test/t/subquery_sj_innodb_none_bka.test mysql-test/t/subquery_sj_innodb_none_bkaunique.test mysql-test/t/subquery_sj_loosescan_bka.test mysql-test/t/subquery_sj_loosescan_bkaunique.test mysql-test/t/subquery_sj_mat_bka.test mysql-test/t/subquery_sj_mat_bkaunique.test mysql-test/t/subquery_sj_none_bka.test mysql-test/t/subquery_sj_none_bkaunique.test mysql-test/valgrind.supp scripts/mysql_install_db.pl.in scripts/mysql_install_db.sh scripts/mysqld_safe.sh sql/CMakeLists.txt sql/event_scheduler.cc sql/filesort.cc sql/ha_partition.cc sql/ha_partition.h sql/handler.cc sql/handler.h sql/item.cc sql/item.h sql/item_buff.cc sql/item_cmpfunc.cc sql/item_create.cc sql/item_func.cc sql/item_subselect.cc sql/item_subselect.h sql/item_sum.cc sql/item_sum.h sql/item_xmlfunc.cc sql/lex.h sql/lock.cc sql/log_event.cc sql/mysqld.cc sql/opt_explain.cc sql/opt_range.cc sql/opt_trace.cc sql/opt_trace.h sql/opt_trace2server.cc sql/rpl_info.h sql/rpl_info_dummy.cc sql/rpl_info_dummy.h sql/rpl_info_factory.cc sql/rpl_info_file.cc sql/rpl_info_file.h sql/rpl_info_handler.h sql/rpl_info_table.cc sql/rpl_info_table.h sql/rpl_info_table_access.cc sql/rpl_master.cc sql/rpl_mi.cc sql/rpl_rli.cc sql/rpl_rli.h sql/rpl_rli_pdb.cc sql/rpl_slave.cc sql/share/errmsg-utf8.txt sql/sp_head.cc sql/sp_head.h sql/sp_pcontext.cc sql/sp_pcontext.h sql/sp_rcontext.cc sql/sp_rcontext.h sql/sql_array.h sql/sql_base.cc sql/sql_class.cc sql/sql_class.h sql/sql_cmd.h sql/sql_error.cc sql/sql_error.h sql/sql_insert.cc sql/sql_lex.cc sql/sql_lex.h sql/sql_list.h sql/sql_parse.cc sql/sql_parse.h sql/sql_prepare.cc sql/sql_select.cc sql/sql_select.h sql/sql_show.cc sql/sql_signal.cc sql/sql_table.cc sql/sql_yacc.yy sql/sys_vars.cc sql/table.cc sql/table.h sql/udf_example.c storage/archive/azio.c storage/archive/ha_archive.cc storage/archive/ha_archive.h storage/heap/ha_heap.cc storage/heap/hp_create.c storage/heap/hp_info.c storage/innobase/btr/btr0cur.c storage/innobase/btr/btr0sea.c storage/innobase/buf/buf0buf.c storage/innobase/buf/buf0lru.c storage/innobase/dict/dict0stats.c storage/innobase/ha/ha0ha.c storage/innobase/handler/ha_innodb.cc storage/innobase/handler/i_s.cc storage/innobase/ibuf/ibuf0ibuf.c storage/innobase/include/btr0cur.h storage/innobase/include/btr0cur.ic storage/innobase/include/btr0sea.h storage/innobase/include/btr0types.h storage/innobase/include/buf0buf.h storage/innobase/include/buf0buf.ic storage/innobase/include/buf0types.h storage/innobase/include/db0err.h storage/innobase/include/ha0ha.h storage/innobase/include/ha0ha.ic storage/innobase/include/row0upd.ic storage/innobase/include/sync0rw.h storage/innobase/include/sync0rw.ic storage/innobase/include/sync0sync.h storage/innobase/include/ut0crc32.h storage/innobase/os/os0file.c storage/innobase/page/page0page.c storage/innobase/rem/rem0rec.c storage/innobase/row/row0sel.c storage/innobase/srv/srv0start.c storage/innobase/sync/sync0rw.c storage/innobase/sync/sync0sync.c storage/innobase/ut/ut0crc32.c storage/myisam/ha_myisam.cc storage/perfschema/pfs_instr.cc storage/perfschema/table_ews_by_thread_by_event_name.cc storage/perfschema/table_socket_summary_by_event_name.cc storage/perfschema/table_socket_summary_by_instance.cc storage/perfschema/table_socket_summary_by_instance.h support-files/mysql.spec.sh tests/mysql_client_test.c unittest/gunit/CMakeLists.txt unittest/gunit/bounds_checked_array-t.cc unittest/gunit/opt_trace-t.cc unittest/gunit/sql_list-t.cc unittest/mysys/my_atomic-t.c cmd-line-utils/libedit/el_terminal.h cmd-line-utils/libedit/keymacro.c cmd-line-utils/libedit/keymacro.h cmd-line-utils/libedit/terminal.c 3435 magnus.blaudd@stripped 2011-09-27 [merge] Merge added: storage/ndb/compile-cluster Diff too large for email (281520 lines, the limit is 10000). No bundle (reason: useless for push emails).