3206 Marc Alff 2010-12-03 [merge]
Merge mysql-trunk --> mysql-trunk-wl2111
removed:
Doxyfile-wl4895
mysql-test/suite/perfschema/r/schema.result
added:
Doxyfile-perfschema
mysql-test/collections/mysql-next-mr-wl2540.push
mysql-test/collections/mysql-trunk.daily
mysql-test/collections/mysql-trunk.weekly
mysql-test/extra/rpl_tests/rpl_change_master.test
mysql-test/extra/rpl_tests/rpl_crash_safe.inc
mysql-test/extra/rpl_tests/rpl_crash_safe.test
mysql-test/include/have_binlog_checksum_off.inc
mysql-test/include/not_master_info_table.inc
mysql-test/include/not_relay_log_info_table.inc
mysql-test/suite/binlog/r/binlog_checksum.result
mysql-test/suite/binlog/t/binlog_checksum.test
mysql-test/suite/perfschema/r/ddl_os_global_by_type.result
mysql-test/suite/perfschema/r/ddl_setup_objects.result
mysql-test/suite/perfschema/r/dml_os_global_by_type.result
mysql-test/suite/perfschema/r/dml_setup_objects.result
mysql-test/suite/perfschema/r/setup_objects.result
mysql-test/suite/perfschema/r/start_server_no_setup_objects.result
mysql-test/suite/perfschema/t/ddl_os_global_by_type.test
mysql-test/suite/perfschema/t/ddl_setup_objects.test
mysql-test/suite/perfschema/t/dml_os_global_by_type.test
mysql-test/suite/perfschema/t/dml_setup_objects.test
mysql-test/suite/perfschema/t/setup_objects.test
mysql-test/suite/perfschema/t/start_server_no_setup_objects-master.opt
mysql-test/suite/perfschema/t/start_server_no_setup_objects.test
mysql-test/suite/rpl/extension/README.checksum
mysql-test/suite/rpl/extension/checksum.pl
mysql-test/suite/rpl/r/rpl_change_master_crash_safe.result
mysql-test/suite/rpl/r/rpl_checksum.result
mysql-test/suite/rpl/r/rpl_checksum_cache.result
mysql-test/suite/rpl/r/rpl_corruption.result
mysql-test/suite/rpl/r/rpl_migration_crash_safe.result
mysql-test/suite/rpl/r/rpl_mixed_crash_safe.result
mysql-test/suite/rpl/r/rpl_row_crash_safe.result
mysql-test/suite/rpl/r/rpl_stm_crash_safe.result
mysql-test/suite/rpl/t/rpl_change_master_crash_safe-slave.opt
mysql-test/suite/rpl/t/rpl_change_master_crash_safe.test
mysql-test/suite/rpl/t/rpl_checksum-master.opt
mysql-test/suite/rpl/t/rpl_checksum.test
mysql-test/suite/rpl/t/rpl_checksum_cache.test
mysql-test/suite/rpl/t/rpl_corruption-master.opt
mysql-test/suite/rpl/t/rpl_corruption-slave.opt
mysql-test/suite/rpl/t/rpl_corruption.test
mysql-test/suite/rpl/t/rpl_migration_crash_safe.test
mysql-test/suite/rpl/t/rpl_mixed_crash_safe-slave.opt
mysql-test/suite/rpl/t/rpl_mixed_crash_safe.test
mysql-test/suite/rpl/t/rpl_row_crash_safe-slave.opt
mysql-test/suite/rpl/t/rpl_row_crash_safe.test
mysql-test/suite/rpl/t/rpl_stm_crash_safe-slave.opt
mysql-test/suite/rpl/t/rpl_stm_crash_safe.test
mysql-test/suite/sys_vars/r/binlog_checksum_basic.result
mysql-test/suite/sys_vars/r/master_verify_checksum_basic.result
mysql-test/suite/sys_vars/r/pfs_setup_objects_size_basic.result
mysql-test/suite/sys_vars/r/slave_sql_verify_checksum_basic.result
mysql-test/suite/sys_vars/t/binlog_checksum_basic.test
mysql-test/suite/sys_vars/t/master_verify_checksum_basic.test
mysql-test/suite/sys_vars/t/pfs_setup_objects_size_basic-master.opt
mysql-test/suite/sys_vars/t/pfs_setup_objects_size_basic.test
mysql-test/suite/sys_vars/t/slave_sql_verify_checksum_basic.test
sql/rpl_info_table.cc
sql/rpl_info_table.h
sql/rpl_info_table_access.cc
sql/rpl_info_table_access.h
sql/rpl_info_values.cc
sql/rpl_info_values.h
storage/perfschema/pfs_setup_object.cc
storage/perfschema/pfs_setup_object.h
storage/perfschema/table_ews_by_thread_by_event_name.cc
storage/perfschema/table_ews_by_thread_by_event_name.h
storage/perfschema/table_helper.cc
storage/perfschema/table_os_global_by_type.cc
storage/perfschema/table_os_global_by_type.h
storage/perfschema/table_setup_objects.cc
storage/perfschema/table_setup_objects.h
storage/perfschema/unittest/stub_pfs_defaults.h
storage/perfschema/unittest/stub_server_misc.h
modified:
.bzrignore
client/mysqlbinlog.cc
client/mysqldump.c
libmysqld/CMakeLists.txt
libmysqld/Makefile.am
mysql-test/collections/default.experimental
mysql-test/extra/binlog_tests/binlog.test
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test
mysql-test/extra/rpl_tests/rpl_conflicts.test
mysql-test/extra/rpl_tests/rpl_flsh_tbls.test
mysql-test/extra/rpl_tests/rpl_reset_slave.test
mysql-test/extra/rpl_tests/rpl_start_stop_slave.test
mysql-test/include/mtr_warnings.sql
mysql-test/r/1st.result
mysql-test/r/connect.result
mysql-test/r/information_schema.result
mysql-test/r/log_tables.result
mysql-test/r/log_tables_upgrade.result
mysql-test/r/mysql_upgrade.result
mysql-test/r/mysql_upgrade_ssl.result
mysql-test/r/mysqlcheck.result
mysql-test/r/mysqld--help-notwin.result
mysql-test/r/mysqld--help-win.result
mysql-test/r/system_mysql_db.result
mysql-test/suite/binlog/r/binlog_killed.result
mysql-test/suite/binlog/r/binlog_old_versions.result
mysql-test/suite/binlog/r/binlog_row_binlog.result
mysql-test/suite/binlog/r/binlog_stm_binlog.result
mysql-test/suite/binlog/t/binlog_killed.test
mysql-test/suite/binlog/t/binlog_old_versions.test
mysql-test/suite/binlog/t/disabled.def
mysql-test/suite/funcs_1/r/is_columns_mysql.result
mysql-test/suite/funcs_1/r/is_key_column_usage.result
mysql-test/suite/funcs_1/r/is_statistics.result
mysql-test/suite/funcs_1/r/is_statistics_mysql.result
mysql-test/suite/funcs_1/r/is_table_constraints.result
mysql-test/suite/funcs_1/r/is_table_constraints_mysql.result
mysql-test/suite/funcs_1/r/is_tables_mysql.result
mysql-test/suite/perfschema/include/schema.inc
mysql-test/suite/perfschema/include/start_server_common.inc
mysql-test/suite/perfschema/r/dml_setup_consumers.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/privilege_table_io.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_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/perfschema_stress/r/modify.result
mysql-test/suite/perfschema_stress/r/read.result
mysql-test/suite/perfschema_stress/t/modify.test
mysql-test/suite/perfschema_stress/t/read.test
mysql-test/suite/perfschema_stress/t/setup.test
mysql-test/suite/rpl/r/rpl_change_master.result
mysql-test/suite/rpl/r/rpl_heartbeat_basic.result
mysql-test/suite/rpl/r/rpl_rotate_logs.result
mysql-test/suite/rpl/r/rpl_row_conflicts.result
mysql-test/suite/rpl/r/rpl_server_uuid.result
mysql-test/suite/rpl/t/disabled.def
mysql-test/suite/rpl/t/rpl_change_master.test
mysql-test/suite/rpl/t/rpl_flushlog_loop.test
mysql-test/suite/rpl/t/rpl_heartbeat_basic.test
mysql-test/suite/rpl/t/rpl_known_bugs_detection.test
mysql-test/suite/rpl/t/rpl_rotate_logs.test
mysql-test/suite/rpl/t/rpl_row_ignorable_event.test
mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test
mysql-test/suite/rpl/t/rpl_seconds_behind_master.test
mysql-test/suite/rpl/t/rpl_server_uuid.test
mysql-test/suite/rpl/t/rpl_show_master_info_file.test
mysql-test/suite/rpl/t/rpl_stm_flsh_tbls.test
mysql-test/suite/rpl/t/rpl_sync.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_multi.test
mysql-test/suite/sys_vars/t/all_vars.test
mysql-test/suite/sys_vars/t/master_info_repository_basic.test
mysql-test/suite/sys_vars/t/relay_log_info_repository_basic.test
mysql-test/t/mysqlbinlog2.test
mysql-test/t/system_mysql_db_fix40123.test
mysql-test/t/system_mysql_db_fix50030.test
mysql-test/t/system_mysql_db_fix50117.test
scripts/mysql_install_db.pl.in
scripts/mysql_install_db.sh
scripts/mysql_system_tables.sql
sql/CMakeLists.txt
sql/Makefile.am
sql/binlog.cc
sql/binlog.h
sql/lock.cc
sql/log.cc
sql/log_event.cc
sql/log_event.h
sql/mysqld.cc
sql/mysqld.h
sql/rpl_info.h
sql/rpl_info_factory.cc
sql/rpl_info_factory.h
sql/rpl_info_file.cc
sql/rpl_info_file.h
sql/rpl_info_handler.cc
sql/rpl_info_handler.h
sql/rpl_master.cc
sql/rpl_mi.cc
sql/rpl_mi.h
sql/rpl_rli.cc
sql/rpl_rli.h
sql/rpl_slave.cc
sql/rpl_slave.h
sql/rpl_utility.cc
sql/server_ids.h
sql/share/errmsg-utf8.txt
sql/sql_base.cc
sql/sql_base.h
sql/sql_binlog.cc
sql/sql_class.h
sql/sql_parse.cc
sql/sql_parse.h
sql/sys_vars.cc
sql/sys_vars.h
sql/table.cc
sql/table.h
storage/perfschema/CMakeLists.txt
storage/perfschema/Makefile.am
storage/perfschema/pfs.cc
storage/perfschema/pfs_defaults.cc
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_server.cc
storage/perfschema/pfs_server.h
storage/perfschema/pfs_stat.h
storage/perfschema/pfs_timer.cc
storage/perfschema/pfs_timer.h
storage/perfschema/table_all_instr.cc
storage/perfschema/table_all_instr.h
storage/perfschema/table_events_waits.cc
storage/perfschema/table_events_waits.h
storage/perfschema/table_events_waits_summary.cc
storage/perfschema/table_events_waits_summary.h
storage/perfschema/table_ews_global_by_event_name.cc
storage/perfschema/table_ews_global_by_event_name.h
storage/perfschema/table_file_summary.cc
storage/perfschema/table_file_summary.h
storage/perfschema/table_helper.h
storage/perfschema/table_setup_consumers.cc
storage/perfschema/table_setup_instruments.cc
storage/perfschema/unittest/pfs-t.cc
storage/perfschema/unittest/pfs_instr-oom-t.cc
storage/perfschema/unittest/pfs_instr-t.cc
storage/perfschema/unittest/pfs_instr_class-oom-t.cc
storage/perfschema/unittest/pfs_instr_class-t.cc
3205 Marc Alff 2010-11-15
WL#2111 Stored Procedures: Implement GET DIAGNOSTICS
Preserving previous work from mysql-next-mr-wl2111
modified:
.bzr-mysql/default.conf
sql/item_create.cc
sql/lex.h
sql/mysqld.cc
sql/sql_class.h
sql/sql_cmd.h
sql/sql_lex.cc
sql/sql_lex.h
sql/sql_signal.cc
sql/sql_signal.h
sql/sql_yacc.yy
Diff too large for email (30414 lines, the limit is 10000).
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-trunk-wl2111 branch (marc.alff:3205 to 3206) | Marc Alff | 3 Dec |
