3409 Marc Alff 2011-09-19 [merge]
Merge mysql-trunk --> mysql-trunk-wl5863
removed:
mysql-test/std_data/bug57108.cnf
scripts/make_binary_distribution.sh
scripts/make_win_bin_dist
added:
mysql-test/r/auth_rpl.result
mysql-test/suite/sys_vars/t/plugin_dir_basic-master.opt
mysql-test/t/auth_rpl-master.opt
mysql-test/t/auth_rpl-slave.opt
mysql-test/t/auth_rpl.test
modified:
CMakeLists.txt
client/mysqltest.cc
cmake/build_configurations/mysql_release.cmake
cmake/install_macros.cmake
config.h.cmake
dbug/dbug.c
include/decimal.h
include/my_base.h
libmysql/client_settings.h
mysql-test/collections/disabled-daily.list
mysql-test/collections/disabled-weekly.list
mysql-test/include/icp_tests.inc
mysql-test/include/mtr_check.sql
mysql-test/include/mysqld--help.inc
mysql-test/include/range.inc
mysql-test/include/subquery.inc
mysql-test/include/subquery_sj.inc
mysql-test/lib/mtr_cases.pm
mysql-test/mysql-test-run.pl
mysql-test/r/alter_table.result
mysql-test/r/derived.result
mysql-test/r/execution_constants.result
mysql-test/r/group_by.result
mysql-test/r/innodb_icp.result
mysql-test/r/innodb_icp_none.result
mysql-test/r/innodb_mrr_cost_icp.result
mysql-test/r/innodb_mrr_icp.result
mysql-test/r/join.result
mysql-test/r/myisam_icp.result
mysql-test/r/myisam_icp_none.result
mysql-test/r/myisampack.result
mysql-test/r/mysqltest.result
mysql-test/r/partition_innodb.result
mysql-test/r/query_cache.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/subquery_all.result
mysql-test/r/subquery_all_bka.result
mysql-test/r/subquery_nomat_nosj.result
mysql-test/r/subquery_nomat_nosj_bka.result
mysql-test/r/subquery_nomat_nosj_bka_nobnl.result
mysql-test/r/subquery_none.result
mysql-test/r/subquery_none_bka.result
mysql-test/r/subquery_none_bka_nobnl.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_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_bka_nobnl.result
mysql-test/r/subquery_sj_none_bkaunique.result
mysql-test/r/type_newdecimal.result
mysql-test/r/view_grant.result
mysql-test/suite/innodb/r/innodb-index.result
mysql-test/suite/innodb/t/innodb-index.test
mysql-test/suite/opt_trace/r/bugs_no_prot_none.result
mysql-test/suite/opt_trace/r/bugs_ps_prot_none.result
mysql-test/suite/perfschema/r/pfs_upgrade.result
mysql-test/suite/perfschema/r/socket_summary_by_instance_func.result
mysql-test/suite/perfschema/r/socket_summary_by_instance_func_win.result
mysql-test/suite/perfschema/t/socket_instances_func.test
mysql-test/suite/perfschema/t/socket_instances_func_win.test
mysql-test/suite/perfschema/t/socket_summary_by_instance_func.test
mysql-test/suite/perfschema/t/socket_summary_by_instance_func_win.test
mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result
mysql-test/suite/rpl/r/rpl_spec_variables.result
mysql-test/suite/rpl/t/disabled.def
mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test
mysql-test/suite/rpl/t/rpl_spec_variables.test
mysql-test/suite/sys_vars/r/plugin_dir_basic.result
mysql-test/suite/sys_vars/t/plugin_dir_basic.test
mysql-test/t/alter_table.test
mysql-test/t/derived.test
mysql-test/t/execution_constants.test
mysql-test/t/group_by.test
mysql-test/t/join.test
mysql-test/t/multi_plugin_load.test
mysql-test/t/myisampack.test
mysql-test/t/mysqltest.test
mysql-test/t/partition_innodb.test
mysql-test/t/query_cache.test
mysql-test/t/type_newdecimal.test
mysql-test/t/view_grant.test
mysql-test/valgrind.supp
mysys/my_handler_errors.h
plugin/semisync/semisync_master.cc
scripts/CMakeLists.txt
scripts/mysql_install_db.pl.in
scripts/mysql_install_db.sh
scripts/mysql_system_tables.sql
sql/CMakeLists.txt
sql/client_settings.h
sql/filesort.cc
sql/handler.cc
sql/item.cc
sql/item.h
sql/my_decimal.h
sql/opt_range.cc
sql/records.cc
sql/rpl_slave.cc
sql/share/errmsg-utf8.txt
sql/sql_base.cc
sql/sql_cache.cc
sql/sql_select.cc
sql/sql_table.cc
sql/sql_update.cc
sql/table.cc
sql/table.h
sql/uniques.cc
storage/innobase/CMakeLists.txt
storage/innobase/btr/btr0btr.c
storage/innobase/btr/btr0cur.c
storage/innobase/buf/buf0buddy.c
storage/innobase/buf/buf0buf.c
storage/innobase/buf/buf0checksum.c
storage/innobase/buf/buf0flu.c
storage/innobase/data/data0data.c
storage/innobase/dict/dict0dict.c
storage/innobase/dict/dict0load.c
storage/innobase/dict/dict0stats.c
storage/innobase/fil/fil0fil.c
storage/innobase/fsp/fsp0fsp.c
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/i_s.cc
storage/innobase/ibuf/ibuf0ibuf.c
storage/innobase/include/btr0btr.h
storage/innobase/include/btr0btr.ic
storage/innobase/include/btr0cur.h
storage/innobase/include/buf0buf.h
storage/innobase/include/buf0buf.ic
storage/innobase/include/buf0checksum.h
storage/innobase/include/buf0types.h
storage/innobase/include/data0data.ic
storage/innobase/include/data0type.ic
storage/innobase/include/db0err.h
storage/innobase/include/dict0dict.h
storage/innobase/include/dict0dict.ic
storage/innobase/include/dict0load.h
storage/innobase/include/fsp0fsp.h
storage/innobase/include/mtr0mtr.h
storage/innobase/include/mtr0mtr.ic
storage/innobase/include/page0page.h
storage/innobase/include/page0page.ic
storage/innobase/include/page0zip.ic
storage/innobase/include/rem0rec.ic
storage/innobase/include/row0upd.ic
storage/innobase/include/srv0srv.h
storage/innobase/include/sync0sync.h
storage/innobase/include/sync0sync.ic
storage/innobase/include/trx0sys.h
storage/innobase/include/trx0trx.h
storage/innobase/include/trx0undo.h
storage/innobase/include/univ.i
storage/innobase/mtr/mtr0log.c
storage/innobase/mtr/mtr0mtr.c
storage/innobase/page/page0cur.c
storage/innobase/page/page0page.c
storage/innobase/page/page0zip.c
storage/innobase/rem/rem0cmp.c
storage/innobase/row/row0ins.c
storage/innobase/row/row0merge.c
storage/innobase/row/row0mysql.c
storage/innobase/row/row0row.c
storage/innobase/row/row0sel.c
storage/innobase/row/row0upd.c
storage/innobase/srv/srv0srv.c
storage/innobase/srv/srv0start.c
storage/innobase/sync/sync0sync.c
storage/innobase/trx/trx0rec.c
storage/innobase/trx/trx0undo.c
storage/innobase/ut/ut0ut.c
storage/myisam/ft_boolean_search.c
storage/myisam/ft_nlq_search.c
storage/myisam/ha_myisam.cc
storage/myisam/mi_check.c
storage/myisam/mi_write.c
storage/perfschema/pfs_instr.h
strings/decimal.c
support-files/mysql.spec.sh
unittest/gunit/CMakeLists.txt
unittest/gunit/my_decimal-t.cc
3408 Marc Alff 2011-08-26
WL#5863 PERFORMANCE SCHEMA, NESTED-SET data model
Added the END_EVENT_ID column to events tables.
modified:
.bzr-mysql/default.conf
mysql-test/suite/perfschema/r/func_file_io.result
mysql-test/suite/perfschema/r/pfs_upgrade.result
mysql-test/suite/perfschema/r/schema.result
mysql-test/suite/perfschema/r/start_server_nothing.result
mysql-test/suite/perfschema/r/table_schema.result
scripts/mysql_system_tables.sql
storage/perfschema/pfs.cc
storage/perfschema/pfs_events.h
storage/perfschema/pfs_instr.cc
storage/perfschema/table_events_stages.cc
storage/perfschema/table_events_stages.h
storage/perfschema/table_events_statements.cc
storage/perfschema/table_events_statements.h
storage/perfschema/table_events_waits.cc
storage/perfschema/table_events_waits.h
Diff too large for email (13460 lines, the limit is 10000).
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-trunk-wl5863 branch (marc.alff:3408 to 3409) | Marc Alff | 20 Sep |
