From: Tor Didriksen Date: July 20 2011 10:30am Subject: bzr push into mysql-trunk branch (tor.didriksen:3341 to 3344) List-Archive: http://lists.mysql.com/commits/140387 Message-Id: <201107201030.p6KAUwch023176@acsmt356.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3344 Tor Didriksen 2011-07-20 [merge] Merge opt-backporting => opt-team added: mysql-test/include/have_optimizer_trace.inc mysql-test/suite/optimizer_trace/ mysql-test/suite/optimizer_trace/include/ mysql-test/suite/optimizer_trace/include/optimizer_trace.inc mysql-test/suite/optimizer_trace/include/optimizer_trace2.inc mysql-test/suite/optimizer_trace/include/optimizer_trace_bugs.inc mysql-test/suite/optimizer_trace/include/optimizer_trace_range.inc mysql-test/suite/optimizer_trace/include/optimizer_trace_security.inc mysql-test/suite/optimizer_trace/include/optimizer_trace_subquery.inc mysql-test/suite/optimizer_trace/r/ mysql-test/suite/optimizer_trace/r/optimizer_trace2_no_prot.result mysql-test/suite/optimizer_trace/r/optimizer_trace2_ps_prot.result mysql-test/suite/optimizer_trace/r/optimizer_trace_bugs_no_prot_all.result mysql-test/suite/optimizer_trace/r/optimizer_trace_bugs_no_prot_none.result mysql-test/suite/optimizer_trace/r/optimizer_trace_bugs_ps_prot_all.result mysql-test/suite/optimizer_trace/r/optimizer_trace_bugs_ps_prot_none.result mysql-test/suite/optimizer_trace/r/optimizer_trace_charset.result mysql-test/suite/optimizer_trace/r/optimizer_trace_debug.result mysql-test/suite/optimizer_trace/r/optimizer_trace_no_prot_all.result mysql-test/suite/optimizer_trace/r/optimizer_trace_no_prot_none.result mysql-test/suite/optimizer_trace/r/optimizer_trace_ps_prot_all.result mysql-test/suite/optimizer_trace/r/optimizer_trace_ps_prot_none.result mysql-test/suite/optimizer_trace/r/optimizer_trace_range_no_prot.result mysql-test/suite/optimizer_trace/r/optimizer_trace_range_ps_prot.result mysql-test/suite/optimizer_trace/r/optimizer_trace_security_no_prot.result mysql-test/suite/optimizer_trace/r/optimizer_trace_security_ps_prot.result mysql-test/suite/optimizer_trace/r/optimizer_trace_subquery_no_prot.result mysql-test/suite/optimizer_trace/r/optimizer_trace_subquery_ps_prot.result mysql-test/suite/optimizer_trace/t/ mysql-test/suite/optimizer_trace/t/optimizer_trace2_no_prot.test mysql-test/suite/optimizer_trace/t/optimizer_trace2_ps_prot.test mysql-test/suite/optimizer_trace/t/optimizer_trace_bugs_no_prot_all.test mysql-test/suite/optimizer_trace/t/optimizer_trace_bugs_no_prot_none.test mysql-test/suite/optimizer_trace/t/optimizer_trace_bugs_ps_prot_all.test mysql-test/suite/optimizer_trace/t/optimizer_trace_bugs_ps_prot_none.test mysql-test/suite/optimizer_trace/t/optimizer_trace_charset.test mysql-test/suite/optimizer_trace/t/optimizer_trace_debug.test mysql-test/suite/optimizer_trace/t/optimizer_trace_no_prot_all.test mysql-test/suite/optimizer_trace/t/optimizer_trace_no_prot_none.test mysql-test/suite/optimizer_trace/t/optimizer_trace_ps_prot_all.test mysql-test/suite/optimizer_trace/t/optimizer_trace_ps_prot_none.test mysql-test/suite/optimizer_trace/t/optimizer_trace_range_no_prot.test mysql-test/suite/optimizer_trace/t/optimizer_trace_range_ps_prot.test mysql-test/suite/optimizer_trace/t/optimizer_trace_security_no_prot.test mysql-test/suite/optimizer_trace/t/optimizer_trace_security_ps_prot.test mysql-test/suite/optimizer_trace/t/optimizer_trace_subquery_no_prot.test mysql-test/suite/optimizer_trace/t/optimizer_trace_subquery_ps_prot.test mysql-test/suite/optimizer_trace/validate_json.py mysql-test/suite/sys_vars/r/optimizer_trace_basic.result mysql-test/suite/sys_vars/r/optimizer_trace_features_basic.result mysql-test/suite/sys_vars/r/optimizer_trace_limit_basic.result mysql-test/suite/sys_vars/r/optimizer_trace_max_mem_size_basic.result mysql-test/suite/sys_vars/r/optimizer_trace_offset_basic.result mysql-test/suite/sys_vars/r/optimizer_trace_offset_max.result mysql-test/suite/sys_vars/t/optimizer_trace_basic.test mysql-test/suite/sys_vars/t/optimizer_trace_features_basic.test mysql-test/suite/sys_vars/t/optimizer_trace_limit_basic.test mysql-test/suite/sys_vars/t/optimizer_trace_max_mem_size_basic.test mysql-test/suite/sys_vars/t/optimizer_trace_offset_basic.test mysql-test/suite/sys_vars/t/optimizer_trace_offset_max-master.opt mysql-test/suite/sys_vars/t/optimizer_trace_offset_max.test sql/opt_trace.cc sql/opt_trace.h sql/opt_trace2server.cc sql/opt_trace_Doxyfile sql/opt_trace_context.h unittest/gunit/opt_trace-t.cc modified: .bzrignore CMakeLists.txt client/mysqltest.cc config.h.cmake dbug/dbug.c include/my_getopt.h include/my_sys.h include/mysql/plugin.h include/mysql/plugin_audit.h.pp include/mysql/plugin_auth.h.pp include/mysql/plugin_ftparser.h.pp mysql-test/collections/default.experimental mysql-test/mysql-test-run.pl mysql-test/r/archive_gis.result mysql-test/r/auto_increment.result mysql-test/r/bench_count_distinct.result mysql-test/r/bigint.result mysql-test/r/case.result mysql-test/r/cast.result mysql-test/r/compare.result mysql-test/r/compress.result mysql-test/r/ctype_binary.result mysql-test/r/ctype_collate.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/date_formats.result mysql-test/r/explain.result mysql-test/r/fulltext.result mysql-test/r/func_compress.result mysql-test/r/func_crypt.result mysql-test/r/func_default.result mysql-test/r/func_encrypt.result mysql-test/r/func_gconcat.result mysql-test/r/func_group.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_like.result mysql-test/r/func_math.result mysql-test/r/func_op.result mysql-test/r/func_regexp.result mysql-test/r/func_set.result mysql-test/r/func_str.result mysql-test/r/func_system.result mysql-test/r/func_test.result mysql-test/r/func_time.result mysql-test/r/gis.result mysql-test/r/group_by.result mysql-test/r/group_min_max.result mysql-test/r/having.result mysql-test/r/information_schema.result mysql-test/r/information_schema_db.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/insert_update.result mysql-test/r/join.result mysql-test/r/join_nested.result mysql-test/r/join_nested_jcl6.result mysql-test/r/join_outer.result mysql-test/r/join_outer_jcl6.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/mysqld--help-notwin.result mysql-test/r/mysqld--help-win.result mysql-test/r/mysqlshow.result mysql-test/r/named_pipe.result mysql-test/r/negation_elimination.result mysql-test/r/null.result mysql-test/r/olap.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_pruning.result mysql-test/r/ps.result mysql-test/r/query_cache.result mysql-test/r/row.result mysql-test/r/select_all.result mysql-test/r/select_all_jcl6.result mysql-test/r/select_icp_mrr.result mysql-test/r/select_icp_mrr_jcl6.result mysql-test/r/select_none.result mysql-test/r/select_none_jcl6.result mysql-test/r/shm.result mysql-test/r/ssl.result mysql-test/r/ssl_compress.result mysql-test/r/subquery_all.result mysql-test/r/subquery_all_jcl6.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_jcl6.result mysql-test/r/subquery_none.result mysql-test/r/subquery_none_jcl6.result mysql-test/r/subquery_sj_all.result mysql-test/r/subquery_sj_all_jcl6.result mysql-test/r/subquery_sj_all_jcl7.result mysql-test/r/subquery_sj_dupsweed.result mysql-test/r/subquery_sj_dupsweed_jcl6.result mysql-test/r/subquery_sj_dupsweed_jcl7.result mysql-test/r/subquery_sj_firstmatch.result mysql-test/r/subquery_sj_firstmatch_jcl6.result mysql-test/r/subquery_sj_firstmatch_jcl7.result mysql-test/r/subquery_sj_loosescan.result mysql-test/r/subquery_sj_loosescan_jcl6.result mysql-test/r/subquery_sj_loosescan_jcl7.result mysql-test/r/subquery_sj_mat.result mysql-test/r/subquery_sj_mat_jcl6.result mysql-test/r/subquery_sj_mat_jcl7.result mysql-test/r/subquery_sj_mat_nosj.result mysql-test/r/subquery_sj_none.result mysql-test/r/subquery_sj_none_jcl6.result mysql-test/r/subquery_sj_none_jcl7.result mysql-test/r/subselect_innodb.result mysql-test/r/type_blob.result mysql-test/r/type_datetime.result mysql-test/r/udf.result mysql-test/r/union.result mysql-test/r/varbinary.result mysql-test/r/variables.result mysql-test/r/view.result mysql-test/suite/binlog/r/binlog_stm_blackhole.result mysql-test/suite/funcs_1/r/is_columns_is.result mysql-test/suite/funcs_1/r/is_columns_is_embedded.result mysql-test/suite/funcs_1/r/is_tables_is.result mysql-test/suite/innodb/r/innodb_gis.result mysql-test/suite/rpl/r/rpl_get_lock.result mysql-test/suite/rpl/r/rpl_master_pos_wait.result mysql-test/suite/sys_vars/t/all_vars.test mysys/array.c mysys/my_alloc.c mysys/my_getopt.c mysys/my_malloc.c sql/CMakeLists.txt sql/handler.h sql/item.cc sql/item_cmpfunc.cc sql/item_cmpfunc.h sql/item_func.cc sql/item_subselect.cc sql/item_subselect.h sql/mysqld.cc sql/mysqld.h sql/opt_explain.cc sql/opt_range.cc sql/opt_range.h sql/set_var.cc sql/set_var.h sql/sp_head.cc sql/sp_head.h sql/sql_array.h sql/sql_base.cc sql/sql_class.h sql/sql_delete.cc sql/sql_derived.cc sql/sql_help.cc sql/sql_parse.cc sql/sql_plugin.h sql/sql_prepare.cc sql/sql_select.cc sql/sql_select.h sql/sql_show.cc sql/sql_test.cc sql/sql_test.h sql/sql_update.cc sql/sql_view.cc sql/sys_vars.cc sql/sys_vars.h sql/table.cc unittest/gunit/CMakeLists.txt 3343 Tor Didriksen 2011-07-20 [merge] NULL merge opt-backporting => opt-team 3342 Tor Didriksen 2011-07-20 [merge] Automerge opt-backporting => opt-team modified: mysql-test/r/subquery_all.result mysql-test/r/subquery_all_jcl6.result mysql-test/r/subquery_nomat_nosj_jcl6.result mysql-test/r/subquery_none_jcl6.result 3341 Tor Didriksen 2011-07-07 [merge] empty merge trunk => opt-team Diff too large for email (102640 lines, the limit is 10000). No bundle (reason: useless for push emails).