3260 Tor Didriksen 2010-12-15 [merge]
Automerge from trunk-bugfixing
removed:
Doxyfile-wl4895
mysql-test/collections/mysql-trunk-bugfixing.daily
mysql-test/collections/mysql-trunk-bugfixing.push
mysql-test/suite/perfschema/r/schema.result
mysql-test/suite/sys_vars/t/max_binlog_cache_size_func-master.opt
added:
Doxyfile-perfschema
mysql-test/extra/rpl_tests/rpl_lower_case_table_names.test
mysql-test/include/ctype_heap.inc
mysql-test/r/bug58669.result
mysql-test/r/ctype_utf16le.result
mysql-test/r/partition_binlog.result
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/perfschema/t/thread_cache-master.opt
mysql-test/suite/rpl/r/rpl_lcase_tblnames_rewrite_db.result
mysql-test/suite/rpl/r/rpl_row_lcase_tblnames.result
mysql-test/suite/rpl/r/rpl_stm_lcase_tblnames.result
mysql-test/suite/rpl/t/rpl_lcase_tblnames_rewrite_db-slave.opt
mysql-test/suite/rpl/t/rpl_lcase_tblnames_rewrite_db.test
mysql-test/suite/rpl/t/rpl_row_lcase_tblnames-slave.opt
mysql-test/suite/rpl/t/rpl_row_lcase_tblnames.test
mysql-test/suite/rpl/t/rpl_stm_lcase_tblnames-slave.opt
mysql-test/suite/rpl/t/rpl_stm_lcase_tblnames.test
mysql-test/suite/sys_vars/inc/binlog_stmt_cache_size_basic.inc
mysql-test/suite/sys_vars/r/binlog_stmt_cache_size_basic_32.result
mysql-test/suite/sys_vars/r/binlog_stmt_cache_size_basic_64.result
mysql-test/suite/sys_vars/r/max_binlog_stmt_cache_size_basic.result
mysql-test/suite/sys_vars/r/pfs_setup_objects_size_basic.result
mysql-test/suite/sys_vars/t/binlog_stmt_cache_size_basic_32.test
mysql-test/suite/sys_vars/t/binlog_stmt_cache_size_basic_64.test
mysql-test/suite/sys_vars/t/max_binlog_stmt_cache_size_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/t/bug58669-master.opt
mysql-test/t/bug58669.test
mysql-test/t/ctype_utf16le.test
mysql-test/t/partition_binlog.test
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
renamed:
mysql-test/extra/binlog_tests/innodb_stat.test => mysql-test/extra/binlog_tests/binlog_cache_stat.test
mysql-test/suite/binlog/r/binlog_mix_innodb_stat.result => mysql-test/suite/binlog/r/binlog_mixed_cache_stat.result
mysql-test/suite/binlog/r/binlog_row_innodb_stat.result => mysql-test/suite/binlog/r/binlog_row_cache_stat.result
mysql-test/suite/binlog/r/binlog_stm_innodb_stat.result => mysql-test/suite/binlog/r/binlog_stm_cache_stat.result
mysql-test/suite/binlog/t/binlog_mix_innodb_stat.test => mysql-test/suite/binlog/t/binlog_mixed_cache_stat.test
mysql-test/suite/binlog/t/binlog_row_innodb_stat.test => mysql-test/suite/binlog/t/binlog_row_cache_stat.test
mysql-test/suite/binlog/t/binlog_stm_innodb_stat.test => mysql-test/suite/binlog/t/binlog_stm_cache_stat.test
storage/perfschema/unittest/stub_server_misc.h => storage/perfschema/unittest/stub_server_misc.h.moved
modified:
.bzrignore
client/mysqladmin.cc
client/mysqldump.c
client/mysqltest.cc
cmake/build_configurations/mysql_release.cmake
cmake/character_sets.cmake
dbug/dbug.c
include/base64.h
include/m_ctype.h
include/my_dbug.h
include/my_sys.h
include/mysql/plugin_audit.h
include/mysql/plugin_audit.h.pp
include/mysys_err.h
mysql-test/collections/default.weekly
mysql-test/collections/mysql-trunk.push
mysql-test/collections/mysql-trunk.weekly
mysql-test/collections/test-bt
mysql-test/collections/test-bt-debug
mysql-test/collections/test-bt-fast
mysql-test/extra/binlog_tests/binlog.test
mysql-test/extra/rpl_tests/rpl_binlog_max_cache_size.test
mysql-test/include/ctype_numconv.inc
mysql-test/mysql-test-run.pl
mysql-test/r/archive.result
mysql-test/r/auto_increment.result
mysql-test/r/ctype_binary.result
mysql-test/r/ctype_cp1251.result
mysql-test/r/ctype_latin1.result
mysql-test/r/ctype_many.result
mysql-test/r/ctype_ucs.result
mysql-test/r/ctype_utf16.result
mysql-test/r/ctype_utf32.result
mysql-test/r/ctype_utf8.result
mysql-test/r/derived.result
mysql-test/r/func_gconcat.result
mysql-test/r/func_group.result
mysql-test/r/func_group_innodb.result
mysql-test/r/func_str.result
mysql-test/r/multi_update.result
mysql-test/r/mysqld--help-notwin.result
mysql-test/r/mysqld--help-win.result
mysql-test/r/mysqltest.result
mysql-test/r/plugin_auth.result
mysql-test/r/union.result
mysql-test/r/view.result
mysql-test/suite/binlog/r/binlog_base64_flag.result
mysql-test/suite/binlog/r/binlog_innodb.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_base64_flag.test
mysql-test/suite/funcs_1/r/innodb_func_view.result
mysql-test/suite/funcs_1/r/memory_func_view.result
mysql-test/suite/funcs_1/r/myisam_func_view.result
mysql-test/suite/innodb/r/innodb-autoinc.result
mysql-test/suite/innodb/r/innodb_multi_update.result
mysql-test/suite/innodb/t/innodb-autoinc.test
mysql-test/suite/innodb/t/innodb_multi_update.test
mysql-test/suite/parts/inc/part_supported_sql_funcs_main.inc
mysql-test/suite/parts/inc/partition_decimal.inc
mysql-test/suite/parts/inc/partition_double.inc
mysql-test/suite/parts/inc/partition_float.inc
mysql-test/suite/parts/r/partition_decimal_innodb.result
mysql-test/suite/parts/r/partition_decimal_myisam.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/t/thread_cache.test
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_checksum_cache.result
mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result
mysql-test/suite/rpl/r/rpl_packet.result
mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result
mysql-test/suite/rpl/r/rpl_stm_EE_err2.result
mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result
mysql-test/suite/rpl/t/rpl_packet.test
mysql-test/suite/sys_vars/r/character_set_client_basic.result
mysql-test/suite/sys_vars/r/character_set_connection_basic.result
mysql-test/suite/sys_vars/r/character_set_database_basic.result
mysql-test/suite/sys_vars/r/character_set_filesystem_basic.result
mysql-test/suite/sys_vars/r/character_set_results_basic.result
mysql-test/t/archive.test
mysql-test/t/auto_increment.test
mysql-test/t/ctype_many.test
mysql-test/t/derived.test
mysql-test/t/func_gconcat.test
mysql-test/t/func_group.test
mysql-test/t/func_group_innodb.test
mysql-test/t/func_str.test
mysql-test/t/multi_update.test
mysql-test/t/mysqltest.test
mysql-test/t/plugin_auth.test
mysql-test/t/union.test
mysql-test/t/view.test
mysql-test/valgrind.supp
mysys/base64.c
mysys/charset-def.c
mysys/errors.c
mysys/mf_pack.c
mysys/my_seek.c
mysys/my_symlink.c
scripts/mysql_system_tables.sql
sql/binlog.cc
sql/binlog.h
sql/field.cc
sql/ha_partition.cc
sql/ha_partition.h
sql/handler.cc
sql/item.cc
sql/item_cmpfunc.cc
sql/item_create.cc
sql/item_func.cc
sql/item_row.cc
sql/item_strfunc.cc
sql/item_strfunc.h
sql/item_subselect.cc
sql/item_subselect.h
sql/item_sum.cc
sql/item_sum.h
sql/log_event.cc
sql/log_event.h
sql/mysqld.cc
sql/mysqld.h
sql/opt_range.cc
sql/opt_sum.cc
sql/rpl_info_table.cc
sql/share/errmsg-utf8.txt
sql/sp_head.cc
sql/sql_audit.cc
sql/sql_audit.h
sql/sql_binlog.cc
sql/sql_class.h
sql/sql_connect.cc
sql/sql_cursor.cc
sql/sql_db.cc
sql/sql_derived.cc
sql/sql_lex.cc
sql/sql_lex.h
sql/sql_parse.cc
sql/sql_partition_admin.cc
sql/sql_prepare.cc
sql/sql_priv.h
sql/sql_select.cc
sql/sql_show.cc
sql/sql_string.cc
sql/sql_view.cc
sql/sql_yacc.yy
sql/sys_vars.cc
storage/archive/ha_archive.cc
storage/myisam/mi_check.c
storage/perfschema/CMakeLists.txt
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/table_threads.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-t.cc
strings/ctype-ucs2.c
strings/ctype-utf8.c
unittest/mysys/base64-t.c
mysql-test/extra/binlog_tests/binlog_cache_stat.test
mysql-test/suite/binlog/r/binlog_mixed_cache_stat.result
mysql-test/suite/binlog/r/binlog_row_cache_stat.result
mysql-test/suite/binlog/r/binlog_stm_cache_stat.result
mysql-test/suite/binlog/t/binlog_mixed_cache_stat.test
mysql-test/suite/binlog/t/binlog_row_cache_stat.test
mysql-test/suite/binlog/t/binlog_stm_cache_stat.test
3259 Tor Didriksen 2010-12-06 [merge]
NULL merge opt-backporting => opt-team
Diff too large for email (29374 lines, the limit is 10000).
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-trunk-bugfixing branch (tor.didriksen:3259 to 3260) | Tor Didriksen | 15 Dec |
