#At file:///home/bm136801/my/upd-tr/ based on revid:bjorn.munch@stripped
2998 Bjorn Munch 2010-12-20 [merge]
new merge from trunk
removed:
mysql-test/collections/mysql-trunk-bugfixing.daily
mysql-test/collections/mysql-trunk-bugfixing.push
mysql-test/suite/innodb/r/innodb_bug56947.result
mysql-test/suite/innodb/t/innodb_bug56947.test
mysql-test/suite/sys_vars/t/max_binlog_cache_size_func-master.opt
added:
cmake/maintainer.cmake
mysql-test/extra/rpl_tests/rpl_lower_case_table_names.test
mysql-test/include/ctype_heap.inc
mysql-test/include/io_thd_fault_injection.inc
mysql-test/r/ctype_utf16le.result
mysql-test/r/order_by_sortkey.result
mysql-test/suite/innodb/r/innodb_bug56947.result
mysql-test/suite/innodb/t/innodb_bug56947.test
mysql-test/suite/rpl/r/rpl_binlog_errors.result
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_binlog_errors-master.opt
mysql-test/suite/rpl/t/rpl_binlog_errors.test
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/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/t/ctype_utf16le.test
mysql-test/t/order_by_sortkey.test
sql/bounded_queue.h
sql/filesort_utils.cc
sql/filesort_utils.h
unittest/gunit/bounded_queue-t.cc
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
modified:
.bzrignore
CMakeLists.txt
client/mysqladmin.cc
client/mysqldump.c
cmake/build_configurations/mysql_release.cmake
cmake/character_sets.cmake
dbug/dbug.c
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
libmysqld/CMakeLists.txt
mysql-test/collections/default.experimental
mysql-test/collections/default.weekly
mysql-test/collections/mysql-trunk.push
mysql-test/collections/mysql-trunk.weekly
mysql-test/extra/binlog_tests/binlog.test
mysql-test/extra/rpl_tests/rpl_binlog_max_cache_size.test
mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test
mysql-test/include/order_by.inc
mysql-test/include/restart_mysqld.inc
mysql-test/include/select.inc
mysql-test/r/archive.result
mysql-test/r/auto_increment.result
mysql-test/r/ctype_many.result
mysql-test/r/ctype_utf16.result
mysql-test/r/ctype_utf32.result
mysql-test/r/derived.result
mysql-test/r/explain.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/group_by.result
mysql-test/r/index_merge_myisam.result
mysql-test/r/join_cache_jcl1.result
mysql-test/r/join_cache_jcl2.result
mysql-test/r/join_cache_jcl3.result
mysql-test/r/join_cache_jcl4.result
mysql-test/r/join_outer_innodb.result
mysql-test/r/join_outer_jcl6.result
mysql-test/r/multi_update.result
mysql-test/r/myisam_mrr.result
mysql-test/r/myisam_mrr_all.result
mysql-test/r/myisam_mrr_cost.result
mysql-test/r/myisam_mrr_cost_all.result
mysql-test/r/myisam_mrr_cost_icp.result
mysql-test/r/myisam_mrr_icp.result
mysql-test/r/myisam_mrr_none.result
mysql-test/r/mysqld--help-notwin.result
mysql-test/r/mysqld--help-win.result
mysql-test/r/optimizer_switch.result
mysql-test/r/order_by_icp_mrr.result
mysql-test/r/order_by_none.result
mysql-test/r/plugin_auth.result
mysql-test/r/select_icp_mrr.result
mysql-test/r/select_none.result
mysql-test/r/subselect_innodb.result
mysql-test/r/union.result
mysql-test/r/view.result
mysql-test/suite/binlog/r/binlog_index.result
mysql-test/suite/binlog/r/binlog_innodb.result
mysql-test/suite/binlog/r/binlog_max_extension.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_index.test
mysql-test/suite/binlog/t/binlog_max_extension.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/rpl/r/rpl_checksum_cache.result
mysql-test/suite/rpl/r/rpl_manual_change_index_file.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_manual_change_index_file.test
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/suite/sys_vars/r/optimizer_switch_basic.result
mysql-test/t/archive.test
mysql-test/t/auto_increment.test
mysql-test/t/ctype_many.test
mysql-test/t/ctype_utf8.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_misc.test
mysql-test/t/func_str.test
mysql-test/t/group_by.test
mysql-test/t/join_outer_innodb.test
mysql-test/t/multi_update.test
mysql-test/t/partition_innodb.test
mysql-test/t/plugin_auth.test
mysql-test/t/subselect_innodb.test
mysql-test/t/union.test
mysql-test/t/view.test
mysql-test/valgrind.supp
mysys/CMakeLists.txt
mysys/charset-def.c
mysys/errors.c
mysys/mf_pack.c
mysys/my_init.c
mysys/my_seek.c
mysys/my_symlink.c
mysys/queues.c
sql/CMakeLists.txt
sql/binlog.cc
sql/binlog.h
sql/field.cc
sql/filesort.cc
sql/filesort.h
sql/handler.cc
sql/item.cc
sql/item_cmpfunc.cc
sql/item_func.cc
sql/item_row.cc
sql/item_subselect.cc
sql/item_subselect.h
sql/item_sum.cc
sql/item_sum.h
sql/log.cc
sql/log.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_injector.cc
sql/rpl_master.cc
sql/rpl_slave.cc
sql/rpl_slave.h
sql/share/errmsg-utf8.txt
sql/sp_head.cc
sql/sql_audit.cc
sql/sql_audit.h
sql/sql_base.cc
sql/sql_class.cc
sql/sql_class.h
sql/sql_connect.cc
sql/sql_const.h
sql/sql_cursor.cc
sql/sql_db.cc
sql/sql_delete.cc
sql/sql_derived.cc
sql/sql_derived.h
sql/sql_lex.cc
sql/sql_lex.h
sql/sql_load.cc
sql/sql_parse.cc
sql/sql_prepare.cc
sql/sql_priv.h
sql/sql_reload.cc
sql/sql_reload.h
sql/sql_select.cc
sql/sql_select.h
sql/sql_show.cc
sql/sql_sort.h
sql/sql_string.cc
sql/sql_table.cc
sql/sql_update.cc
sql/sql_view.cc
sql/sql_yacc.yy
sql/sys_vars.cc
sql/uniques.cc
storage/archive/ha_archive.cc
storage/myisam/mi_check.c
storage/perfschema/pfs_engine_table.cc
strings/ctype-ucs2.c
unittest/gunit/CMakeLists.txt
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
Diff too large for email (18945 lines, the limit is 10000).
No bundle (reason: revision is a merge).
| Thread |
|---|
| • bzr commit into mysql-trunk-mtr branch (bjorn.munch:2998) | Bjorn Munch | 20 Dec |
