3454 Marc Alff 2012-02-29 [merge]
Merge mysql-trunk --> mysql-trunk-wl5767
Adjusted the digests MD5 in tests results, due to the new FORMAT_SYM token.
added:
mysql-test/include/explain.inc
mysql-test/include/explain_json.inc
mysql-test/include/python_with_json.inc
mysql-test/r/explain_json_all.result
mysql-test/r/explain_json_none.result
mysql-test/r/innodb_explain_json_non_select_all.result
mysql-test/r/innodb_explain_json_non_select_none.result
mysql-test/r/myisam_explain_json_non_select_all.result
mysql-test/r/myisam_explain_json_non_select_none.result
mysql-test/r/python_with_json.require
mysql-test/suite/explain_json_validate/
mysql-test/suite/explain_json_validate/r/
mysql-test/suite/explain_json_validate/r/explain_json_validate.result
mysql-test/suite/explain_json_validate/t/
mysql-test/suite/explain_json_validate/t/explain_json_validate.test
mysql-test/suite/rpl/r/rpl_report_port.result
mysql-test/suite/rpl/t/rpl_report_port-slave.opt
mysql-test/suite/rpl/t/rpl_report_port.test
mysql-test/suite/sys_vars/r/end_markers_in_json_basic.result
mysql-test/suite/sys_vars/t/end_markers_in_json_basic.test
mysql-test/t/explain_json_all.test
mysql-test/t/explain_json_none.test
mysql-test/t/innodb_explain_json_non_select_all.test
mysql-test/t/innodb_explain_json_non_select_none.test
mysql-test/t/myisam_explain_json_non_select_all.test
mysql-test/t/myisam_explain_json_non_select_none.test
sql/opt_explain_format.h
sql/opt_explain_json.cc
sql/opt_explain_json.h
sql/opt_explain_traditional.cc
sql/opt_explain_traditional.h
modified:
client/mysqltest.cc
include/my_sys.h
mysql-test/collections/default.daily
mysql-test/collections/default.push
mysql-test/include/explain_non_select.inc
mysql-test/include/explain_utils.inc
mysql-test/include/index_merge_ror.inc
mysql-test/include/subquery_mat.inc
mysql-test/include/subquery_sj.inc
mysql-test/mysql-test-run.pl
mysql-test/r/archive_gis.result
mysql-test/r/compress.result
mysql-test/r/delete.result
mysql-test/r/derived.result
mysql-test/r/distinct.result
mysql-test/r/error_simulation.result
mysql-test/r/explain.result
mysql-test/r/fulltext.result
mysql-test/r/fulltext_order_by.result
mysql-test/r/func_analyse.result
mysql-test/r/func_compress.result
mysql-test/r/func_default.result
mysql-test/r/func_gconcat.result
mysql-test/r/func_group.result
mysql-test/r/func_group_innodb.result
mysql-test/r/func_if.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/func_regexp.result
mysql-test/r/func_str.result
mysql-test/r/func_test.result
mysql-test/r/gis.result
mysql-test/r/grant_explain_non_select.result
mysql-test/r/greedy_optimizer.result
mysql-test/r/greedy_search.result
mysql-test/r/group_by.result
mysql-test/r/group_min_max.result
mysql-test/r/heap.result
mysql-test/r/heap_btree.result
mysql-test/r/heap_hash.result
mysql-test/r/index_merge_myisam.result
mysql-test/r/information_schema.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/insert_select.result
mysql-test/r/insert_update.result
mysql-test/r/join.result
mysql-test/r/join_cache_bka.result
mysql-test/r/join_cache_bka_nixbnl.result
mysql-test/r/join_cache_bkaunique.result
mysql-test/r/join_cache_bnl.result
mysql-test/r/join_cache_nojb.result
mysql-test/r/join_nested.result
mysql-test/r/join_nested_bka.result
mysql-test/r/join_nested_bka_nixbnl.result
mysql-test/r/join_outer.result
mysql-test/r/join_outer_bka.result
mysql-test/r/join_outer_bka_nixbnl.result
mysql-test/r/key.result
mysql-test/r/key_diff.result
mysql-test/r/merge.result
mysql-test/r/mix2_myisam.result
mysql-test/r/myisam.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/mysqld--help-notwin.result
mysql-test/r/mysqld--help-win.result
mysql-test/r/named_pipe.result
mysql-test/r/null_key_all.result
mysql-test/r/null_key_icp.result
mysql-test/r/null_key_none.result
mysql-test/r/optimizer_switch.result
mysql-test/r/order_by_all.result
mysql-test/r/order_by_icp_mrr.result
mysql-test/r/order_by_none.result
mysql-test/r/partition.result
mysql-test/r/partition_column.result
mysql-test/r/partition_column_prune.result
mysql-test/r/partition_explicit_prune.result
mysql-test/r/partition_innodb.result
mysql-test/r/partition_pruning.result
mysql-test/r/partition_range.result
mysql-test/r/ps.result
mysql-test/r/ps_11bugs.result
mysql-test/r/ps_2myisam.result
mysql-test/r/ps_3innodb.result
mysql-test/r/ps_4heap.result
mysql-test/r/ps_5merge.result
mysql-test/r/ps_ddl1.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/select_all.result
mysql-test/r/select_all_bka.result
mysql-test/r/select_all_bka_nixbnl.result
mysql-test/r/select_found.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/select_safe.result
mysql-test/r/shm.result
mysql-test/r/sql_mode.result
mysql-test/r/ssl.result
mysql-test/r/ssl_compress.result
mysql-test/r/status.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_mat.result
mysql-test/r/subquery_mat_all.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_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_innodb_all.result
mysql-test/r/subquery_sj_innodb_all_bka.result
mysql-test/r/subquery_sj_innodb_all_bka_nixbnl.result
mysql-test/r/subquery_sj_innodb_all_bkaunique.result
mysql-test/r/subquery_sj_innodb_none_bka_nixbnl.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/subselect_innodb.result
mysql-test/r/type_datetime.result
mysql-test/r/type_time.result
mysql-test/r/udf.result
mysql-test/r/union.result
mysql-test/r/user_var.result
mysql-test/r/varbinary.result
mysql-test/r/view.result
mysql-test/suite/binlog/r/binlog_sql_mode.result
mysql-test/suite/binlog/r/binlog_stm_blackhole.result
mysql-test/suite/binlog/t/binlog_sql_mode.test
mysql-test/suite/funcs_1/r/innodb_views.result
mysql-test/suite/funcs_1/r/memory_views.result
mysql-test/suite/innodb/r/innodb-index.result
mysql-test/suite/innodb/r/innodb-index_ucs2.result
mysql-test/suite/innodb/r/innodb.result
mysql-test/suite/innodb/r/innodb_16k.result
mysql-test/suite/innodb/r/innodb_gis.result
mysql-test/suite/innodb/r/innodb_index_large_prefix.result
mysql-test/suite/innodb/r/innodb_index_large_prefix_4k.result
mysql-test/suite/innodb/r/innodb_index_large_prefix_8k.result
mysql-test/suite/innodb/r/innodb_lock_wait_timeout_1.result
mysql-test/suite/innodb/r/innodb_mysql.result
mysql-test/suite/innodb_fts/r/fulltext.result
mysql-test/suite/innodb_fts/r/fulltext_misc.result
mysql-test/suite/innodb_fts/r/fulltext_order_by.result
mysql-test/suite/opt_trace/include/bugs.inc
mysql-test/suite/opt_trace/include/filesort_pq.inc
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/eq_range_statistics.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/opt_trace/r/temp_table.result
mysql-test/suite/opt_trace/t/charset.test
mysql-test/suite/opt_trace/t/eq_range_statistics.test
mysql-test/suite/opt_trace/t/temp_table.test
mysql-test/suite/opt_trace/validate_json.py
mysql-test/suite/perfschema/r/digest_table_full.result
mysql-test/suite/perfschema/r/statement_digest.result
mysql-test/suite/perfschema/r/statement_digest_consumers.result
mysql-test/suite/perfschema/r/statement_digest_long_query.result
mysql-test/suite/rpl/r/rpl_show_slave_hosts.result
mysql-test/suite/rpl/t/rpl_show_slave_hosts.test
mysql-test/suite/sys_vars/r/max_seeks_for_key_func.result
mysql-test/suite/sys_vars/r/optimizer_trace_basic.result
mysql-test/suite/sys_vars/t/optimizer_trace_basic.test
mysql-test/suite/sys_vars/t/report_port_basic.test
mysql-test/t/explain.test
mysql-test/t/group_by.test
mysql-test/t/innodb_explain_non_select_all.test
mysql-test/t/innodb_explain_non_select_none.test
mysql-test/t/myisam.test
mysql-test/t/myisam_explain_non_select_all.test
mysql-test/t/myisam_explain_non_select_none.test
mysql-test/t/partition.test
mysql-test/t/select_found.test
mysql-test/t/sql_mode.test
sql/CMakeLists.txt
sql/item.cc
sql/item.h
sql/item_create.cc
sql/item_subselect.cc
sql/item_subselect.h
sql/lex.h
sql/log_event.cc
sql/log_event.h
sql/mysqld.cc
sql/opt_explain.cc
sql/opt_explain.h
sql/opt_range.cc
sql/opt_range.h
sql/opt_trace.cc
sql/opt_trace2server.cc
sql/opt_trace_context.h
sql/share/errmsg-utf8.txt
sql/sp_head.cc
sql/sql_acl.cc
sql/sql_acl.h
sql/sql_class.cc
sql/sql_class.h
sql/sql_delete.cc
sql/sql_executor.cc
sql/sql_lex.cc
sql/sql_lex.h
sql/sql_list.h
sql/sql_optimizer.cc
sql/sql_optimizer.h
sql/sql_partition.cc
sql/sql_partition.h
sql/sql_prepare.cc
sql/sql_resolver.cc
sql/sql_rewrite.cc
sql/sql_select.cc
sql/sql_select.h
sql/sql_string.h
sql/sql_union.cc
sql/sql_update.cc
sql/sql_yacc.yy
sql/sys_vars.cc
storage/innobase/row/row0ins.cc
3453 Mayank Prasad 2012-02-29 [merge]
WL#5767 : Statements Digest, performance Schema.
Merge: mysql-trunk -> mysql-trunk-wl5767
modified:
mysql-test/suite/innodb/r/innodb_bug-13628249.result
mysql-test/suite/innodb/t/innodb-blob.test
mysql-test/suite/innodb/t/innodb_bug-13628249.test
sql/hostname.h
storage/innobase/row/row0mysql.cc
Diff too large for email (157504 lines, the limit is 10000).
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-trunk-wl5767 branch (marc.alff:3453 to 3454) | Marc Alff | 5 Mar |
