List:Commits« Previous MessageNext Message »
From:Tor Didriksen Date:July 21 2011 7:22am
Subject:bzr push into mysql-trunk branch (tor.didriksen:3406 to 3408)
View as plain text  
 3408 Tor Didriksen	2011-07-21 [merge]
      NULL merge trunk => opt-backporting

 3407 Tor Didriksen	2011-07-21 [merge]
      Merge trunk => opt-backporting, conflicts: sql_select.cc

    added:
      mysql-test/suite/rpl/r/rpl_row_corruption.result
      mysql-test/suite/rpl/t/rpl_row_corruption-slave.opt
      mysql-test/suite/rpl/t/rpl_row_corruption.test
      mysql-test/suite/sys_vars/r/innodb_random_read_ahead_basic.result
      mysql-test/suite/sys_vars/r/innodb_undo_directory_basic.result
      mysql-test/suite/sys_vars/r/innodb_undo_logs_basic.result
      mysql-test/suite/sys_vars/r/innodb_undo_tablespaces_basic.result
      mysql-test/suite/sys_vars/t/innodb_random_read_ahead_basic.test
      mysql-test/suite/sys_vars/t/innodb_undo_directory_basic.test
      mysql-test/suite/sys_vars/t/innodb_undo_logs_basic.test
      mysql-test/suite/sys_vars/t/innodb_undo_tablespaces_basic.test
    modified:
      client/mysqlbinlog.cc
      include/mysql/psi/psi.h
      include/mysql/psi/psi_abi_v1.h.pp
      include/welcome_copyright_notice.h
      libmysqld/examples/CMakeLists.txt
      mysql-test/collections/default.daily
      mysql-test/collections/default.experimental
      mysql-test/collections/default.weekly
      mysql-test/extra/rpl_tests/rpl_reset_slave.test
      mysql-test/include/mix1.inc
      mysql-test/lib/mtr_cases.pm
      mysql-test/mysql-test-run.pl
      mysql-test/r/func_math.result
      mysql-test/r/grant.result
      mysql-test/r/greedy_optimizer.result
      mysql-test/r/information_schema.result
      mysql-test/r/sp.result
      mysql-test/r/view.result
      mysql-test/suite/innodb/r/innodb-index.result
      mysql-test/suite/innodb/r/innodb_mysql.result
      mysql-test/suite/innodb/t/innodb-index.test
      mysql-test/suite/perfschema/r/dml_setup_objects.result
      mysql-test/suite/perfschema/r/information_schema.result
      mysql-test/suite/perfschema/r/pfs_upgrade.result
      mysql-test/suite/perfschema/r/privilege_table_io.result
      mysql-test/suite/perfschema/r/schema.result
      mysql-test/suite/perfschema/r/setup_objects.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/r/table_schema.result
      mysql-test/suite/perfschema/t/dml_setup_objects.test
      mysql-test/suite/perfschema/t/privilege_table_io.test
      mysql-test/suite/perfschema/t/setup_objects.test
      mysql-test/suite/rpl/r/rpl_row_reset_slave.result
      mysql-test/suite/rpl/r/rpl_stm_reset_slave.result
      mysql-test/suite/sys_vars/r/all_vars.result
      mysql-test/t/disabled.def
      mysql-test/t/func_math.test
      mysql-test/t/grant.test
      mysql-test/t/greedy_optimizer.test
      mysql-test/t/implicit_commit.test
      mysql-test/t/information_schema.test
      mysql-test/t/sp.test
      mysql-test/t/view.test
      mysys/psi_noop.cc
      plugin/audit_null/audit_null.c
      scripts/mysql_system_tables.sql
      sql/ha_ndbcluster.cc
      sql/ha_partition.cc
      sql/ha_partition.h
      sql/handler.cc
      sql/handler.h
      sql/item_func.cc
      sql/item_geofunc.cc
      sql/log_event.cc
      sql/partition_info.cc
      sql/rpl_info_file.cc
      sql/rpl_mi.cc
      sql/rpl_mi.h
      sql/rpl_slave.cc
      sql/sp_head.cc
      sql/sp_head.h
      sql/sql_base.cc
      sql/sql_class.cc
      sql/sql_insert.cc
      sql/sql_lex.h
      sql/sql_load.cc
      sql/sql_parse.cc
      sql/sql_profile.cc
      sql/sql_select.cc
      sql/sql_view.cc
      sql/sql_yacc.yy
      storage/innobase/buf/buf0buf.c
      storage/innobase/buf/buf0rea.c
      storage/innobase/dict/dict0crea.c
      storage/innobase/fil/fil0fil.c
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/include/buf0buf.h
      storage/innobase/include/buf0buf.ic
      storage/innobase/include/buf0lru.h
      storage/innobase/include/buf0rea.h
      storage/innobase/include/os0file.h
      storage/innobase/include/os0file.ic
      storage/innobase/include/srv0srv.h
      storage/innobase/include/sync0sync.ic
      storage/innobase/include/trx0rseg.h
      storage/innobase/include/trx0sys.h
      storage/innobase/include/trx0sys.ic
      storage/innobase/include/ut0ut.h
      storage/innobase/lock/lock0lock.c
      storage/innobase/log/log0recv.c
      storage/innobase/os/os0file.c
      storage/innobase/row/row0purge.c
      storage/innobase/row/row0row.c
      storage/innobase/srv/srv0mon.c
      storage/innobase/srv/srv0srv.c
      storage/innobase/srv/srv0start.c
      storage/innobase/trx/trx0purge.c
      storage/innobase/trx/trx0rec.c
      storage/innobase/trx/trx0rseg.c
      storage/innobase/trx/trx0sys.c
      storage/innobase/trx/trx0trx.c
      storage/innobase/trx/trx0undo.c
      storage/innobase/ut/ut0ut.c
      storage/perfschema/pfs.cc
      storage/perfschema/pfs_defaults.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_setup_object.cc
      storage/perfschema/pfs_setup_object.h
      storage/perfschema/table_setup_consumers.cc
      storage/perfschema/table_setup_consumers.h
      storage/perfschema/table_setup_instruments.cc
      storage/perfschema/table_setup_objects.cc
      storage/perfschema/table_setup_objects.h
      storage/perfschema/unittest/pfs-t.cc
      storage/perfschema/unittest/pfs_instr_class-t.cc
      strings/decimal.c
      support-files/mysql-log-rotate.sh
      support-files/mysql.spec.sh
      tests/mysql_client_test.c
      unittest/gunit/CMakeLists.txt
      unittest/gunit/my_decimal-t.cc
 3406 Guilhem Bichot	2011-07-20
      Making shorter test names:
      suite "optimizer_trace" renamed to "opt_trace";
      test "optimizer_trace_xxx" renamed to "xxx",
      though optimizer_trace.inc is renamed to general.inc.

    renamed:
      mysql-test/suite/optimizer_trace/ => mysql-test/suite/opt_trace/
      mysql-test/suite/optimizer_trace/include/optimizer_trace.inc => mysql-test/suite/opt_trace/include/general.inc
      mysql-test/suite/optimizer_trace/include/optimizer_trace2.inc => mysql-test/suite/opt_trace/include/general2.inc
      mysql-test/suite/optimizer_trace/include/optimizer_trace_bugs.inc => mysql-test/suite/opt_trace/include/bugs.inc
      mysql-test/suite/optimizer_trace/include/optimizer_trace_range.inc => mysql-test/suite/opt_trace/include/range.inc
      mysql-test/suite/optimizer_trace/include/optimizer_trace_security.inc => mysql-test/suite/opt_trace/include/security.inc
      mysql-test/suite/optimizer_trace/include/optimizer_trace_subquery.inc => mysql-test/suite/opt_trace/include/subquery.inc
      mysql-test/suite/optimizer_trace/r/optimizer_trace2_no_prot.result => mysql-test/suite/opt_trace/r/general2_no_prot.result
      mysql-test/suite/optimizer_trace/r/optimizer_trace2_ps_prot.result => mysql-test/suite/opt_trace/r/general2_ps_prot.result
      mysql-test/suite/optimizer_trace/r/optimizer_trace_bugs_no_prot_all.result => mysql-test/suite/opt_trace/r/bugs_no_prot_all.result
      mysql-test/suite/optimizer_trace/r/optimizer_trace_bugs_no_prot_none.result => mysql-test/suite/opt_trace/r/bugs_no_prot_none.result
      mysql-test/suite/optimizer_trace/r/optimizer_trace_bugs_ps_prot_all.result => mysql-test/suite/opt_trace/r/bugs_ps_prot_all.result
      mysql-test/suite/optimizer_trace/r/optimizer_trace_bugs_ps_prot_none.result => mysql-test/suite/opt_trace/r/bugs_ps_prot_none.result
      mysql-test/suite/optimizer_trace/r/optimizer_trace_charset.result => mysql-test/suite/opt_trace/r/charset.result
      mysql-test/suite/optimizer_trace/r/optimizer_trace_debug.result => mysql-test/suite/opt_trace/r/debug.result
      mysql-test/suite/optimizer_trace/r/optimizer_trace_no_prot_all.result => mysql-test/suite/opt_trace/r/general_no_prot_all.result
      mysql-test/suite/optimizer_trace/r/optimizer_trace_no_prot_none.result => mysql-test/suite/opt_trace/r/general_no_prot_none.result
      mysql-test/suite/optimizer_trace/r/optimizer_trace_ps_prot_all.result => mysql-test/suite/opt_trace/r/general_ps_prot_all.result
      mysql-test/suite/optimizer_trace/r/optimizer_trace_ps_prot_none.result => mysql-test/suite/opt_trace/r/general_ps_prot_none.result
      mysql-test/suite/optimizer_trace/r/optimizer_trace_range_no_prot.result => mysql-test/suite/opt_trace/r/range_no_prot.result
      mysql-test/suite/optimizer_trace/r/optimizer_trace_range_ps_prot.result => mysql-test/suite/opt_trace/r/range_ps_prot.result
      mysql-test/suite/optimizer_trace/r/optimizer_trace_security_no_prot.result => mysql-test/suite/opt_trace/r/security_no_prot.result
      mysql-test/suite/optimizer_trace/r/optimizer_trace_security_ps_prot.result => mysql-test/suite/opt_trace/r/security_ps_prot.result
      mysql-test/suite/optimizer_trace/r/optimizer_trace_subquery_no_prot.result => mysql-test/suite/opt_trace/r/subquery_no_prot.result
      mysql-test/suite/optimizer_trace/r/optimizer_trace_subquery_ps_prot.result => mysql-test/suite/opt_trace/r/subquery_ps_prot.result
      mysql-test/suite/optimizer_trace/t/optimizer_trace2_no_prot.test => mysql-test/suite/opt_trace/t/general2_no_prot.test
      mysql-test/suite/optimizer_trace/t/optimizer_trace2_ps_prot.test => mysql-test/suite/opt_trace/t/general2_ps_prot.test
      mysql-test/suite/optimizer_trace/t/optimizer_trace_bugs_no_prot_all.test => mysql-test/suite/opt_trace/t/bugs_no_prot_all.test
      mysql-test/suite/optimizer_trace/t/optimizer_trace_bugs_no_prot_none.test => mysql-test/suite/opt_trace/t/bugs_no_prot_none.test
      mysql-test/suite/optimizer_trace/t/optimizer_trace_bugs_ps_prot_all.test => mysql-test/suite/opt_trace/t/bugs_ps_prot_all.test
      mysql-test/suite/optimizer_trace/t/optimizer_trace_bugs_ps_prot_none.test => mysql-test/suite/opt_trace/t/bugs_ps_prot_none.test
      mysql-test/suite/optimizer_trace/t/optimizer_trace_charset.test => mysql-test/suite/opt_trace/t/charset.test
      mysql-test/suite/optimizer_trace/t/optimizer_trace_debug.test => mysql-test/suite/opt_trace/t/debug.test
      mysql-test/suite/optimizer_trace/t/optimizer_trace_no_prot_all.test => mysql-test/suite/opt_trace/t/general_no_prot_all.test
      mysql-test/suite/optimizer_trace/t/optimizer_trace_no_prot_none.test => mysql-test/suite/opt_trace/t/general_no_prot_none.test
      mysql-test/suite/optimizer_trace/t/optimizer_trace_ps_prot_all.test => mysql-test/suite/opt_trace/t/general_ps_prot_all.test
      mysql-test/suite/optimizer_trace/t/optimizer_trace_ps_prot_none.test => mysql-test/suite/opt_trace/t/general_ps_prot_none.test
      mysql-test/suite/optimizer_trace/t/optimizer_trace_range_no_prot.test => mysql-test/suite/opt_trace/t/range_no_prot.test
      mysql-test/suite/optimizer_trace/t/optimizer_trace_range_ps_prot.test => mysql-test/suite/opt_trace/t/range_ps_prot.test
      mysql-test/suite/optimizer_trace/t/optimizer_trace_security_no_prot.test => mysql-test/suite/opt_trace/t/security_no_prot.test
      mysql-test/suite/optimizer_trace/t/optimizer_trace_security_ps_prot.test => mysql-test/suite/opt_trace/t/security_ps_prot.test
      mysql-test/suite/optimizer_trace/t/optimizer_trace_subquery_no_prot.test => mysql-test/suite/opt_trace/t/subquery_no_prot.test
      mysql-test/suite/optimizer_trace/t/optimizer_trace_subquery_ps_prot.test => mysql-test/suite/opt_trace/t/subquery_ps_prot.test
    modified:
      mysql-test/mysql-test-run.pl
      sql/opt_trace.h
      mysql-test/suite/opt_trace/t/general2_no_prot.test
      mysql-test/suite/opt_trace/t/general2_ps_prot.test
      mysql-test/suite/opt_trace/t/bugs_no_prot_all.test
      mysql-test/suite/opt_trace/t/bugs_no_prot_none.test
      mysql-test/suite/opt_trace/t/bugs_ps_prot_all.test
      mysql-test/suite/opt_trace/t/bugs_ps_prot_none.test
      mysql-test/suite/opt_trace/t/general_no_prot_all.test
      mysql-test/suite/opt_trace/t/general_no_prot_none.test
      mysql-test/suite/opt_trace/t/general_ps_prot_all.test
      mysql-test/suite/opt_trace/t/general_ps_prot_none.test
      mysql-test/suite/opt_trace/t/range_no_prot.test
      mysql-test/suite/opt_trace/t/range_ps_prot.test
      mysql-test/suite/opt_trace/t/security_no_prot.test
      mysql-test/suite/opt_trace/t/security_ps_prot.test
      mysql-test/suite/opt_trace/t/subquery_no_prot.test
      mysql-test/suite/opt_trace/t/subquery_ps_prot.test

Diff too large for email (14683 lines, the limit is 10000).
No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (tor.didriksen:3406 to 3408) Tor Didriksen21 Jul