List:Commits« Previous MessageNext Message »
From:Jorgen Loland Date:January 25 2011 10:29am
Subject:bzr push into mysql-trunk branch (jorgen.loland:3328 to 3333)
View as plain text  
 3333 Jorgen Loland	2011-01-25
      Recorded result files after merge mysql-trunk -> opt-backporting.

    modified:
      mysql-test/r/func_in_all.result
      mysql-test/r/innodb_icp_all.result
      mysql-test/r/myisam_icp_all.result
      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
 3332 Jorgen Loland	2011-01-25 [merge]
      Automerge mysql-trunk -> opt-backporting. No conflicts

    added:
      mysql-test/suite/perfschema/include/event_aggregate_cleanup.inc
      mysql-test/suite/perfschema/include/event_aggregate_load.inc
      mysql-test/suite/perfschema/include/event_aggregate_setup.inc
      mysql-test/suite/perfschema/include/table_aggregate_cleanup.inc
      mysql-test/suite/perfschema/include/table_aggregate_load.inc
      mysql-test/suite/perfschema/include/table_aggregate_setup.inc
      mysql-test/suite/perfschema/r/ddl_tiws_by_index_usage.result
      mysql-test/suite/perfschema/r/ddl_tiws_by_table.result
      mysql-test/suite/perfschema/r/ddl_tlws_by_table.result
      mysql-test/suite/perfschema/r/dml_tiws_by_index_usage.result
      mysql-test/suite/perfschema/r/dml_tiws_by_table.result
      mysql-test/suite/perfschema/r/dml_tlws_by_table.result
      mysql-test/suite/perfschema/r/event_aggregate.result
      mysql-test/suite/perfschema/r/ortho_iter.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/perfschema/t/ddl_tiws_by_index_usage.test
      mysql-test/suite/perfschema/t/ddl_tiws_by_table.test
      mysql-test/suite/perfschema/t/ddl_tlws_by_table.test
      mysql-test/suite/perfschema/t/dml_tiws_by_index_usage.test
      mysql-test/suite/perfschema/t/dml_tiws_by_table.test
      mysql-test/suite/perfschema/t/dml_tlws_by_table.test
      mysql-test/suite/perfschema/t/event_aggregate-master.opt
      mysql-test/suite/perfschema/t/event_aggregate.test
      mysql-test/suite/perfschema/t/ortho_iter.test
      mysql-test/suite/perfschema/t/table_aggregate_global_2u_2t.test
      mysql-test/suite/perfschema/t/table_aggregate_global_2u_3t.test
      mysql-test/suite/perfschema/t/table_aggregate_global_4u_2t.test
      mysql-test/suite/perfschema/t/table_aggregate_global_4u_3t.test
      mysql-test/suite/perfschema/t/table_aggregate_hist_2u_2t.test
      mysql-test/suite/perfschema/t/table_aggregate_hist_2u_3t.test
      mysql-test/suite/perfschema/t/table_aggregate_hist_4u_2t.test
      mysql-test/suite/perfschema/t/table_aggregate_hist_4u_3t.test
      mysql-test/suite/perfschema/t/table_aggregate_off.test
      mysql-test/suite/perfschema/t/table_aggregate_thread_2u_2t.test
      mysql-test/suite/perfschema/t/table_aggregate_thread_2u_3t.test
      mysql-test/suite/perfschema/t/table_aggregate_thread_4u_2t.test
      mysql-test/suite/perfschema/t/table_aggregate_thread_4u_3t.test
      mysql-test/suite/perfschema/t/table_io_aggregate_global_2u_2t.test
      mysql-test/suite/perfschema/t/table_io_aggregate_global_2u_3t.test
      mysql-test/suite/perfschema/t/table_io_aggregate_global_4u_2t.test
      mysql-test/suite/perfschema/t/table_io_aggregate_global_4u_3t.test
      mysql-test/suite/perfschema/t/table_io_aggregate_hist_2u_2t.test
      mysql-test/suite/perfschema/t/table_io_aggregate_hist_2u_3t.test
      mysql-test/suite/perfschema/t/table_io_aggregate_hist_4u_2t.test
      mysql-test/suite/perfschema/t/table_io_aggregate_hist_4u_3t.test
      mysql-test/suite/perfschema/t/table_io_aggregate_thread_2u_2t.test
      mysql-test/suite/perfschema/t/table_io_aggregate_thread_2u_3t.test
      mysql-test/suite/perfschema/t/table_io_aggregate_thread_4u_2t.test
      mysql-test/suite/perfschema/t/table_io_aggregate_thread_4u_3t.test
      mysql-test/suite/perfschema/t/table_lock_aggregate_global_2u_2t.test
      mysql-test/suite/perfschema/t/table_lock_aggregate_global_2u_3t.test
      mysql-test/suite/perfschema/t/table_lock_aggregate_global_4u_2t.test
      mysql-test/suite/perfschema/t/table_lock_aggregate_global_4u_3t.test
      mysql-test/suite/perfschema/t/table_lock_aggregate_hist_2u_2t.test
      mysql-test/suite/perfschema/t/table_lock_aggregate_hist_2u_3t.test
      mysql-test/suite/perfschema/t/table_lock_aggregate_hist_4u_2t.test
      mysql-test/suite/perfschema/t/table_lock_aggregate_hist_4u_3t.test
      mysql-test/suite/perfschema/t/table_lock_aggregate_thread_2u_2t.test
      mysql-test/suite/perfschema/t/table_lock_aggregate_thread_2u_3t.test
      mysql-test/suite/perfschema/t/table_lock_aggregate_thread_4u_2t.test
      mysql-test/suite/perfschema/t/table_lock_aggregate_thread_4u_3t.test
      mysql-test/suite/rpl/t/rpl_circular_for_4_hosts-master.opt
      storage/perfschema/pfs_visitor.cc
      storage/perfschema/pfs_visitor.h
      storage/perfschema/table_tiws_by_index_usage.cc
      storage/perfschema/table_tiws_by_index_usage.h
      storage/perfschema/table_tiws_by_table.cc
      storage/perfschema/table_tiws_by_table.h
      storage/perfschema/table_tlws_by_table.cc
      storage/perfschema/table_tlws_by_table.h
    modified:
      include/mysql/psi/mysql_table.h
      include/mysql/psi/psi.h
      include/mysql/psi/psi_abi_v1.h.pp
      include/mysql/psi/psi_abi_v2.h.pp
      mysql-test/collections/mysql-trunk.daily
      mysql-test/include/icp_tests.inc
      mysql-test/r/func_group.result
      mysql-test/r/grant.result
      mysql-test/r/innodb_icp.result
      mysql-test/r/innodb_icp_none.result
      mysql-test/r/limit.result
      mysql-test/r/myisam_icp.result
      mysql-test/r/myisam_icp_none.result
      mysql-test/r/subquery_nomat_nosj.result
      mysql-test/r/subquery_none.result
      mysql-test/suite/parts/t/partition_exch_qa_14.test
      mysql-test/suite/perfschema/include/schema.inc
      mysql-test/suite/perfschema/include/start_server_common.inc
      mysql-test/suite/perfschema/r/func_file_io.result
      mysql-test/suite/perfschema/r/information_schema.result
      mysql-test/suite/perfschema/r/pfs_upgrade_lc0.result
      mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result
      mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result
      mysql-test/suite/perfschema/r/schema_lc0.result
      mysql-test/suite/perfschema/r/schema_lc1.result
      mysql-test/suite/perfschema/r/schema_lc2.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_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_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_nothing.result
      mysql-test/suite/perfschema/r/start_server_off.result
      mysql-test/suite/perfschema/r/start_server_on.result
      mysql-test/suite/rpl/r/rpl_row_ignorable_event.result
      mysql-test/suite/rpl/t/rpl_row_ignorable_event.test
      mysys/thr_lock.c
      scripts/mysql_system_tables.sql
      sql/handler.cc
      sql/rpl_master.cc
      sql/rpl_slave.cc
      sql/sql_acl.cc
      sql/sql_insert.cc
      sql/sql_select.cc
      sql/sql_show.cc
      storage/perfschema/CMakeLists.txt
      storage/perfschema/pfs.cc
      storage/perfschema/pfs_column_types.h
      storage/perfschema/pfs_engine_table.cc
      storage/perfschema/pfs_events_waits.cc
      storage/perfschema/pfs_events_waits.h
      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_lock.h
      storage/perfschema/pfs_stat.h
      storage/perfschema/table_events_waits.cc
      storage/perfschema/table_events_waits.h
      storage/perfschema/table_ews_by_thread_by_event_name.cc
      storage/perfschema/table_ews_by_thread_by_event_name.h
      storage/perfschema/table_ews_global_by_event_name.cc
      storage/perfschema/table_ews_global_by_event_name.h
      storage/perfschema/table_helper.cc
      storage/perfschema/table_helper.h
      storage/perfschema/table_os_global_by_type.cc
      storage/perfschema/table_setup_instruments.cc
 3331 Jorgen Loland	2011-01-25 [merge]
      Null-merge mysql-trunk -> opt-backporting

 3330 Jorgen Loland	2011-01-25 [merge]
      Merge BUG#58918 opt-team -> opt-backporting

    modified:
      sql/field.cc
      sql/field.h
      sql/item.cc
      sql/table.cc
 3329 Jorgen Loland	2011-01-25 [merge]
      Automerge mysql-trunk -> opt-backporting No conflicts

    added:
      mysql-test/extra/rpl_tests/rpl_show_binlog_events.inc
      mysql-test/extra/rpl_tests/rpl_show_log_events_with_varying_options.inc
      mysql-test/include/restart_slave_sql.inc
      mysql-test/include/rpl_connection_master.inc
      mysql-test/include/rpl_connection_slave.inc
      mysql-test/include/rpl_connection_slave1.inc
      mysql-test/suite/sys_vars/r/autocommit_func4.result
      mysql-test/suite/sys_vars/r/autocommit_func5.result
      mysql-test/suite/sys_vars/t/autocommit_func4-master.opt
      mysql-test/suite/sys_vars/t/autocommit_func4.test
      mysql-test/suite/sys_vars/t/autocommit_func5-master.opt
      mysql-test/suite/sys_vars/t/autocommit_func5.test
      unittest/gunit/my_decimal-t.cc
    modified:
      client/client_priv.h
      client/mysql.cc
      client/mysql_upgrade.c
      client/mysqladmin.cc
      client/mysqlbinlog.cc
      client/mysqlcheck.c
      client/mysqldump.c
      client/mysqlimport.c
      client/mysqlshow.c
      client/mysqlslap.c
      client/mysqltest.cc
      cmake/character_sets.cmake
      config.h.cmake
      extra/my_print_defaults.c
      include/my_sys.h
      mysql-test/collections/default.experimental
      mysql-test/extra/rpl_tests/rpl_change_master.test
      mysql-test/extra/rpl_tests/rpl_show_relaylog_events.inc
      mysql-test/include/func_in.inc
      mysql-test/include/rpl_start_server.inc
      mysql-test/include/rpl_stop_server.inc
      mysql-test/include/setup_fake_relay_log.inc
      mysql-test/include/wait_for_status_var.inc
      mysql-test/lib/My/ConfigFactory.pm
      mysql-test/lib/My/CoreDump.pm
      mysql-test/lib/My/File/Path.pm
      mysql-test/lib/My/Find.pm
      mysql-test/lib/My/Options.pm
      mysql-test/lib/My/Platform.pm
      mysql-test/lib/My/SafeProcess.pm
      mysql-test/lib/My/SafeProcess/Base.pm
      mysql-test/lib/My/SafeProcess/safe_kill_win.cc
      mysql-test/lib/My/SafeProcess/safe_process.cc
      mysql-test/lib/My/SafeProcess/safe_process_win.cc
      mysql-test/lib/My/SysInfo.pm
      mysql-test/lib/My/Test.pm
      mysql-test/lib/mtr_cases.pm
      mysql-test/lib/mtr_gcov.pl
      mysql-test/lib/mtr_gprof.pl
      mysql-test/lib/mtr_io.pl
      mysql-test/lib/mtr_match.pm
      mysql-test/lib/mtr_misc.pl
      mysql-test/lib/mtr_report.pm
      mysql-test/lib/mtr_stress.pl
      mysql-test/lib/mtr_unique.pm
      mysql-test/mysql-stress-test.pl
      mysql-test/mysql-test-run.pl
      mysql-test/r/client_xml.result
      mysql-test/r/ctype_many.result
      mysql-test/r/ctype_ucs.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/gis-precise.result
      mysql-test/r/mysqladmin.result
      mysql-test/r/mysqld--help-notwin.result
      mysql-test/r/mysqld--help-win.result
      mysql-test/r/mysqldump.result
      mysql-test/r/plugin_auth.result
      mysql-test/r/show_check.result
      mysql-test/r/type_datetime.result
      mysql-test/r/update.result
      mysql-test/r/xml.result
      mysql-test/suite/rpl/r/rpl_change_master.result
      mysql-test/suite/rpl/r/rpl_change_master_crash_safe.result
      mysql-test/suite/rpl/r/rpl_heartbeat_basic.result
      mysql-test/suite/rpl/r/rpl_row_show_relaylog_events.result
      mysql-test/suite/rpl/r/rpl_stm_mix_show_relaylog_events.result
      mysql-test/suite/rpl/r/rpl_stop_slave.result
      mysql-test/suite/rpl/t/rpl_cross_version.test
      mysql-test/suite/rpl/t/rpl_heartbeat_basic.test
      mysql-test/suite/rpl/t/rpl_packet.test
      mysql-test/suite/rpl/t/rpl_stop_slave.test
      mysql-test/suite/sys_vars/r/innodb_max_dirty_pages_pct_func.result
      mysql-test/suite/sys_vars/t/innodb_max_dirty_pages_pct_func.test
      mysql-test/t/ctype_many.test
      mysql-test/t/ctype_ucs.test
      mysql-test/t/func_like.test
      mysql-test/t/func_math.test
      mysql-test/t/gis-precise.test
      mysql-test/t/gis.test
      mysql-test/t/mysqladmin.test
      mysql-test/t/mysqldump.test
      mysql-test/t/plugin_auth.test
      mysql-test/t/show_check.test
      mysql-test/t/type_datetime.test
      mysql-test/t/xml.test
      mysql-test/valgrind.supp
      mysys/default.c
      mysys/my_getopt.c
      sql-common/client.c
      sql/item_cmpfunc.cc
      sql/item_func.cc
      sql/item_strfunc.cc
      sql/item_strfunc.h
      sql/item_sum.h
      sql/my_decimal.h
      sql/mysqld.cc
      sql/mysqld.h
      sql/rpl_master.cc
      sql/rpl_slave.cc
      sql/sql_analyse.cc
      sql/sql_select.cc
      sql/sql_select.h
      storage/ndb/test/run-test/setup.cpp
      strings/bchange.c
      strings/bmove_upp.c
      strings/conf_to_src.c
      strings/ctype-big5.c
      strings/ctype-bin.c
      strings/ctype-cp932.c
      strings/ctype-czech.c
      strings/ctype-euc_kr.c
      strings/ctype-eucjpms.c
      strings/ctype-extra.c
      strings/ctype-gb2312.c
      strings/ctype-gbk.c
      strings/ctype-latin1.c
      strings/ctype-mb.c
      strings/ctype-simple.c
      strings/ctype-sjis.c
      strings/ctype-tis620.c
      strings/ctype-uca.c
      strings/ctype-ucs2.c
      strings/ctype-ujis.c
      strings/ctype-utf8.c
      strings/ctype-win1250ch.c
      strings/ctype.c
      strings/decimal.c
      strings/do_ctype.c
      strings/dtoa.c
      strings/dump_map.c
      strings/int2str.c
      strings/is_prefix.c
      strings/llstr.c
      strings/longlong2str.c
      strings/my_strchr.c
      strings/my_strtoll10.c
      strings/my_vsnprintf.c
      strings/str2int.c
      strings/str_alloc.c
      strings/strappend.c
      strings/strcend.c
      strings/strcont.c
      strings/strend.c
      strings/strfill.c
      strings/strmake.c
      strings/strmov.c
      strings/strnlen.c
      strings/strnmov.c
      strings/strxmov.c
      strings/strxnmov.c
      strings/uca-dump.c
      strings/uctypedump.c
      strings/utr11-dump.c
      strings/xml.c
      unittest/gunit/CMakeLists.txt
 3328 Roy Lyseng	2011-01-24
      Bug#57525: Semijoin transformed subquery with inner grouped subquery
                 gives empty result.
      
      This is a followup to bug#31480, which attempted to fix resolved
      information in subqueries as part of semijoin transformation.
      
      The specific problem here is that the inner subquery (which is not
      transformed) contains an outer reference to the outer-most block in
      its HAVING clause. The HAVING clause is represented by Item_ref
      objects, and these are not re-resolved properly through
      fix_after_pullout().
      The solution lies in realizing that Item_ref objects contain a
      complete set of resolution data structures (ie depended_from,
      name resolution context), and that it may point to an Item object
      with it's own set of resolution data structures.
      Hence, we implement fix_after_pullout() for Item_ref by first
      calling fix_after_pullout() on the referenced object and then for
      itself.
      
      The above fix revealed another problem: The offending query failed
      in prepared statement mode. The reason is that the depended_from
      field in Item_ref is reset in cleanup() and not restored at the
      next fix_fields() call. The problem is fixed by not resetting the
      depended_from flag. This is an acceptable solution, as long as
      transformations are run only on the first execution of a query.
      
      There is also another followup to bug#31480:
      
      A - t1
       \
        B - t2
         \
          C - t3
           \
            D - t4
              where t1.x=t4.y
      
      The above figure describes an outer query expression (select_lex A)
      with 3 nested subqueries represented by select_lex B, C and D.
      The innermost subquery (D) contains a reference to a table t1
      in the outermost block (A).
      The original resolver marked the subquery containing query expression  
      B as using table t1, and the subqueries containing query expressions
      C and D with OUTER_REF_TABLE_BIT.
      The code in bug#31480 failed to preserve all outer references
      when calling fix_after_pullout().
      
      mysql-test/r/optimizer_switch.result
        Updated with correct result and plan for query that exposed bug.
      
      mysql-test/t/optimizer_switch.test
        Warnings about wrong results removed.
      
      sql/item.cc
        A common implementation of fix_after_pullout() for all Item_ref
        classes has been made. The exception is Item_outer_ref which we
        still have no test case for.
        Item_ref::fix_after_pullout() now calls fix_after_pullout() on the
        referenced item, and then it calls Item_ident::fix_after_pullout()
        on itself.
        Item_field::fix_after_pullout() is also moved to class Item_ident,
        which is parent class for both Item_field and Item_ref.
        A new function Item_ref::resolved_used_tables() was needed.
      
      sql/item.h
        Some adjustments to function prototypes, see sql/item.cc.
      
      sql/item_subselect.h
        One changed friend declaration.

    modified:
      mysql-test/r/optimizer_switch.result
      mysql-test/t/optimizer_switch.test
      sql/item.cc
      sql/item.h
      sql/item_subselect.h

Diff too large for email (55862 lines, the limit is 10000).
No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (jorgen.loland:3328 to 3333) Jorgen Loland25 Jan