#At file:///home/alik/MySQL/bzr/00/bug27480/mysql-trunk-bug27480/ based on revid:alexander.nozdrin@stripped
3527 Alexander Nozdrin 2011-02-15 [merge]
Auto-merge from mysql-trunk.
removed:
mysql-test/collections/mysql-5.1-innodb.push
mysql-test/collections/mysql-5.5-innodb.push
mysql-test/collections/mysql-next-mr-wl2540.push
mysql-test/collections/mysql-trunk-innodb.push
mysql-test/collections/mysql-trunk.daily
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-debug-fast
mysql-test/collections/test-bt-fast
mysql-test/suite/perfschema/r/debug_env.result
mysql-test/suite/perfschema/r/dml_file_summary_by_event_name.result
mysql-test/suite/perfschema/r/dml_file_summary_by_instance.result
mysql-test/suite/perfschema/t/debug_env.test
mysql-test/suite/perfschema/t/dml_file_summary_by_event_name.test
mysql-test/suite/perfschema/t/dml_file_summary_by_instance.test
storage/perfschema/unittest/stub_server_misc.h.moved
added:
cmake/info_bin.cmake
cmake/info_macros.cmake.in
cmake/info_src.cmake
include/mysql/service_my_plugin_log.h
libservices/my_plugin_log_service.c
mysql-test/collections/default.release
mysql-test/collections/disabled-daily.list
mysql-test/extra/rpl_tests/rpl_insert_duplicate.test
mysql-test/include/have_dbi_dbd-mysql.inc
mysql-test/r/file_contents.result
mysql-test/r/ssl_and_innodb.result
mysql-test/std_data/checkDBI_DBD-mysql.pl
mysql-test/suite/innodb/r/innodb-autoinc-56228.result
mysql-test/suite/innodb/r/innodb_bug30423.result
mysql-test/suite/innodb/t/innodb-autoinc-56228-master.opt
mysql-test/suite/innodb/t/innodb-autoinc-56228.test
mysql-test/suite/innodb/t/innodb_bug30423.test
mysql-test/suite/perfschema/r/all_tests.result
mysql-test/suite/perfschema/r/ddl_threads.result
mysql-test/suite/perfschema/r/dml_fs_by_event_name.result
mysql-test/suite/perfschema/r/dml_fs_by_instance.result
mysql-test/suite/perfschema/t/all_tests.test
mysql-test/suite/perfschema/t/ddl_threads.test
mysql-test/suite/perfschema/t/dml_fs_by_event_name.test
mysql-test/suite/perfschema/t/dml_fs_by_instance.test
mysql-test/suite/rpl/r/rpl_insert_duplicate.result
mysql-test/suite/rpl/t/rpl_insert_duplicate.test
mysql-test/suite/sys_vars/r/secure_file_priv2.result
mysql-test/suite/sys_vars/t/secure_file_priv2-master.opt
mysql-test/suite/sys_vars/t/secure_file_priv2.test
mysql-test/t/file_contents.test
mysql-test/t/ssl_and_innodb.test
unittest/gunit/item-t.cc
unittest/gunit/test_mdl_context_owner.h
modified:
.bzrignore
BUILD/SETUP.sh
BUILD/build_mccge.sh
CMakeLists.txt
README
client/my_readline.h
client/mysql.cc
client/readline.cc
client/sql_string.cc
client/sql_string.h
cmake/cpack_source_ignore_files.cmake
cmake/make_dist.cmake.in
config.h.cmake
configure.cmake
include/m_ctype.h
include/my_global.h
include/my_pthread.h
include/my_sys.h
include/my_time.h
include/mysql/plugin.h
include/mysql/plugin_audit.h.pp
include/mysql/plugin_auth.h.pp
include/mysql/plugin_ftparser.h.pp
include/mysql/services.h
include/service_versions.h
libmysqld/CMakeLists.txt
libservices/CMakeLists.txt
mysql-test/CMakeLists.txt
mysql-test/collections/default.daily
mysql-test/collections/default.experimental
mysql-test/collections/default.push
mysql-test/collections/default.weekly
mysql-test/extra/rpl_tests/rpl_conflicts.test
mysql-test/extra/rpl_tests/rpl_insert_ignore.test
mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test
mysql-test/extra/rpl_tests/rpl_stop_middle_group.test
mysql-test/include/check-testcase.test
mysql-test/include/commit.inc
mysql-test/include/ctype_numconv.inc
mysql-test/include/gis_keys.inc
mysql-test/include/icp_tests.inc
mysql-test/include/mtr_warnings.sql
mysql-test/include/mysqlhotcopy.inc
mysql-test/include/order_by.inc
mysql-test/include/plugin.defs
mysql-test/include/range.inc
mysql-test/include/rpl_sync.inc
mysql-test/include/subquery.inc
mysql-test/include/subquery_sj.inc
mysql-test/include/subquery_sj_innodb.inc
mysql-test/include/wait_for_slave_io_error.inc
mysql-test/include/wait_for_slave_sql_error.inc
mysql-test/lib/My/SafeProcess.pm
mysql-test/lib/My/SafeProcess/safe_process.cc
mysql-test/lib/My/SafeProcess/safe_process_win.cc
mysql-test/mysql-test-run.pl
mysql-test/r/commit_1innodb.result
mysql-test/r/csv_not_null.result
mysql-test/r/ctype_binary.result
mysql-test/r/ctype_cp1251.result
mysql-test/r/ctype_latin1.result
mysql-test/r/ctype_ucs.result
mysql-test/r/ctype_utf8.result
mysql-test/r/delete.result
mysql-test/r/filesort_debug.result
mysql-test/r/func_in_all.result
mysql-test/r/func_time.result
mysql-test/r/gis.result
mysql-test/r/grant.result
mysql-test/r/innodb_icp.result
mysql-test/r/innodb_icp_all.result
mysql-test/r/innodb_icp_none.result
mysql-test/r/join_outer.result
mysql-test/r/join_outer_jcl6.result
mysql-test/r/myisam_icp.result
mysql-test/r/myisam_icp_all.result
mysql-test/r/myisam_icp_none.result
mysql-test/r/not_embedded_server.result
mysql-test/r/optimizer_switch.result
mysql-test/r/order_by_all.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/plugin_auth_qa_1.result
mysql-test/r/ps.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/select_safe.result
mysql-test/r/sp-error.result
mysql-test/r/subquery_all.result
mysql-test/r/subquery_all_jcl6.result
mysql-test/r/subquery_nomat_nosj.result
mysql-test/r/subquery_nomat_nosj_jcl6.result
mysql-test/r/subquery_none.result
mysql-test/r/subquery_none_jcl6.result
mysql-test/r/subquery_sj_all.result
mysql-test/r/subquery_sj_all_jcl6.result
mysql-test/r/subquery_sj_all_jcl7.result
mysql-test/r/subquery_sj_dupsweed.result
mysql-test/r/subquery_sj_dupsweed_jcl6.result
mysql-test/r/subquery_sj_dupsweed_jcl7.result
mysql-test/r/subquery_sj_firstmatch.result
mysql-test/r/subquery_sj_firstmatch_jcl6.result
mysql-test/r/subquery_sj_firstmatch_jcl7.result
mysql-test/r/subquery_sj_innodb_all.result
mysql-test/r/subquery_sj_innodb_all_jcl6.result
mysql-test/r/subquery_sj_innodb_all_jcl7.result
mysql-test/r/subquery_sj_innodb_none.result
mysql-test/r/subquery_sj_innodb_none_jcl6.result
mysql-test/r/subquery_sj_innodb_none_jcl7.result
mysql-test/r/subquery_sj_loosescan.result
mysql-test/r/subquery_sj_loosescan_jcl6.result
mysql-test/r/subquery_sj_loosescan_jcl7.result
mysql-test/r/subquery_sj_mat.result
mysql-test/r/subquery_sj_mat_jcl6.result
mysql-test/r/subquery_sj_mat_jcl7.result
mysql-test/r/subquery_sj_mat_nosj.result
mysql-test/r/subquery_sj_none.result
mysql-test/r/subquery_sj_none_jcl6.result
mysql-test/r/subquery_sj_none_jcl7.result
mysql-test/r/symlink.result
mysql-test/r/trigger.result
mysql-test/r/type_year.result
mysql-test/r/user_var.result
mysql-test/r/variables.result
mysql-test/r/xa.result
mysql-test/suite/binlog/r/binlog_unsafe.result
mysql-test/suite/binlog/t/binlog_unsafe.test
mysql-test/suite/engines/funcs/r/ps_string_not_null.result
mysql-test/suite/engines/funcs/t/ps_string_not_null.test
mysql-test/suite/innodb/r/innodb_gis.result
mysql-test/suite/innodb/t/innodb_bug56143.test
mysql-test/suite/parts/inc/partition_layout_check1.inc
mysql-test/suite/parts/inc/partition_layout_check2.inc
mysql-test/suite/parts/r/partition_recover_myisam.result
mysql-test/suite/parts/t/partition_alter1_1_2_myisam.test
mysql-test/suite/parts/t/partition_alter1_1_myisam.test
mysql-test/suite/parts/t/partition_alter1_2_myisam.test
mysql-test/suite/parts/t/partition_basic_myisam.test
mysql-test/suite/parts/t/partition_engine_myisam.test
mysql-test/suite/parts/t/partition_recover_myisam.test
mysql-test/suite/parts/t/partition_syntax_myisam.test
mysql-test/suite/perfschema/include/event_aggregate_setup.inc
mysql-test/suite/perfschema/r/ortho_iter.result
mysql-test/suite/perfschema/t/disabled.def
mysql-test/suite/perfschema/t/ortho_iter.test
mysql-test/suite/perfschema/t/start_server_no_cond_class-master.opt
mysql-test/suite/perfschema/t/start_server_no_cond_inst-master.opt
mysql-test/suite/perfschema/t/start_server_no_file_class-master.opt
mysql-test/suite/perfschema/t/start_server_no_file_inst-master.opt
mysql-test/suite/perfschema/t/start_server_no_mutex_class-master.opt
mysql-test/suite/perfschema/t/start_server_no_mutex_inst-master.opt
mysql-test/suite/perfschema/t/start_server_no_rwlock_class-master.opt
mysql-test/suite/perfschema/t/start_server_no_rwlock_inst-master.opt
mysql-test/suite/perfschema/t/start_server_no_table_hdl-master.opt
mysql-test/suite/perfschema/t/start_server_no_table_inst-master.opt
mysql-test/suite/perfschema/t/start_server_no_thread_class-master.opt
mysql-test/suite/perfschema/t/start_server_no_thread_inst-master.opt
mysql-test/suite/rpl/r/rpl_binlog_corruption.result
mysql-test/suite/rpl/r/rpl_checksum.result
mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result
mysql-test/suite/rpl/r/rpl_heartbeat_2slaves.result
mysql-test/suite/rpl/r/rpl_insert_ignore.result
mysql-test/suite/rpl/r/rpl_loaddatalocal.result
mysql-test/suite/rpl/r/rpl_log_pos.result
mysql-test/suite/rpl/r/rpl_row_conflicts.result
mysql-test/suite/rpl/r/rpl_row_event_max_size.result
mysql-test/suite/rpl/r/rpl_show_errors.result
mysql-test/suite/rpl/r/rpl_stm_EE_err2.result
mysql-test/suite/rpl/r/rpl_stm_conflicts.result
mysql-test/suite/rpl/r/rpl_stm_stop_middle_group.result
mysql-test/suite/rpl/t/disabled.def
mysql-test/suite/rpl/t/rpl_binlog_corruption.test
mysql-test/suite/rpl/t/rpl_checksum.test
mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test
mysql-test/suite/rpl/t/rpl_heartbeat_2slaves.test
mysql-test/suite/rpl/t/rpl_insert_ignore.test
mysql-test/suite/rpl/t/rpl_loaddatalocal.test
mysql-test/suite/rpl/t/rpl_show_errors.test
mysql-test/suite/sys_vars/r/all_vars.result
mysql-test/suite/sys_vars/r/max_join_size_func.result
mysql-test/suite/sys_vars/r/sql_big_selects_func.result
mysql-test/t/csv_not_null.test
mysql-test/t/delete.test
mysql-test/t/disabled.def
mysql-test/t/filesort_debug.test
mysql-test/t/func_time.test
mysql-test/t/gis.test
mysql-test/t/grant.test
mysql-test/t/join_outer.test
mysql-test/t/mysql.test
mysql-test/t/not_embedded_server.test
mysql-test/t/optimizer_switch.test
mysql-test/t/plugin_auth.test
mysql-test/t/plugin_auth_qa_1.test
mysql-test/t/ps.test
mysql-test/t/sp-error.test
mysql-test/t/symlink.test
mysql-test/t/trigger.test
mysql-test/t/type_year.test
mysql-test/t/user_var.test
mysql-test/t/variables.test
mysql-test/t/xa.test
mysql-test/valgrind.supp
mysys/charset.c
mysys/my_fopen.c
mysys/my_getsystime.c
plugin/auth/auth_socket.c
plugin/auth/test_plugin.c
regex/my_regex.h
regex/regcomp.c
regex/reginit.c
scripts/mysql_config.pl.in
scripts/mysql_config.sh
sql-common/client.c
sql-common/my_time.c
sql/CMakeLists.txt
sql/field.cc
sql/filesort.cc
sql/gcalc_slicescan.cc
sql/gcalc_slicescan.h
sql/handler.cc
sql/item.cc
sql/item.h
sql/item_cmpfunc.cc
sql/item_func.cc
sql/item_func.h
sql/item_geofunc.h
sql/item_strfunc.cc
sql/item_strfunc.h
sql/item_subselect.h
sql/item_timefunc.cc
sql/item_timefunc.h
sql/log.cc
sql/mdl.cc
sql/mdl.h
sql/mysqld.cc
sql/mysqld.h
sql/net_serv.cc
sql/protocol.cc
sql/rpl_info_handler.h
sql/rpl_injector.cc
sql/rpl_injector.h
sql/rpl_master.cc
sql/rpl_slave.cc
sql/share/errmsg-utf8.txt
sql/sql_base.cc
sql/sql_class.cc
sql/sql_class.h
sql/sql_delete.cc
sql/sql_insert.cc
sql/sql_lex.cc
sql/sql_load.cc
sql/sql_parse.cc
sql/sql_partition.cc
sql/sql_plugin.cc
sql/sql_plugin_services.h
sql/sql_select.cc
sql/sql_string.cc
sql/sql_string.h
sql/sql_table.cc
sql/sql_view.cc
sql/sql_yacc.yy
sql/sys_vars.cc
sql/table.cc
sql/transaction.cc
sql/unireg.h
storage/innobase/CMakeLists.txt
storage/innobase/btr/btr0btr.c
storage/innobase/btr/btr0cur.c
storage/innobase/btr/btr0sea.c
storage/innobase/buf/buf0buddy.c
storage/innobase/buf/buf0buf.c
storage/innobase/buf/buf0lru.c
storage/innobase/dict/dict0dict.c
storage/innobase/dict/dict0load.c
storage/innobase/dict/dict0stats.c
storage/innobase/fsp/fsp0fsp.c
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/handler0alter.cc
storage/innobase/handler/i_s.cc
storage/innobase/ibuf/ibuf0ibuf.c
storage/innobase/include/btr0cur.h
storage/innobase/include/buf0buf.h
storage/innobase/include/buf0lru.h
storage/innobase/include/dict0mem.h
storage/innobase/include/dict0types.h
storage/innobase/include/lock0lock.h
storage/innobase/include/lock0priv.h
storage/innobase/include/os0sync.h
storage/innobase/include/os0sync.ic
storage/innobase/include/os0thread.h
storage/innobase/include/rem0cmp.h
storage/innobase/include/rem0cmp.ic
storage/innobase/include/row0upd.h
storage/innobase/include/row0vers.h
storage/innobase/include/srv0srv.h
storage/innobase/include/sync0rw.h
storage/innobase/include/sync0sync.h
storage/innobase/include/trx0roll.h
storage/innobase/include/trx0rseg.h
storage/innobase/include/trx0sys.h
storage/innobase/include/trx0sys.ic
storage/innobase/include/trx0trx.h
storage/innobase/include/trx0trx.ic
storage/innobase/include/trx0types.h
storage/innobase/include/univ.i
storage/innobase/include/ut0vec.h
storage/innobase/include/ut0vec.ic
storage/innobase/lock/lock0lock.c
storage/innobase/lock/lock0wait.c
storage/innobase/mem/mem0mem.c
storage/innobase/mtr/mtr0log.c
storage/innobase/page/page0zip.c
storage/innobase/que/que0que.c
storage/innobase/read/read0read.c
storage/innobase/rem/rem0cmp.c
storage/innobase/row/row0ins.c
storage/innobase/row/row0merge.c
storage/innobase/row/row0mysql.c
storage/innobase/row/row0purge.c
storage/innobase/row/row0sel.c
storage/innobase/row/row0umod.c
storage/innobase/row/row0upd.c
storage/innobase/row/row0vers.c
storage/innobase/scripts/persistent_storage.sql
storage/innobase/srv/srv0srv.c
storage/innobase/srv/srv0start.c
storage/innobase/sync/sync0arr.c
storage/innobase/sync/sync0rw.c
storage/innobase/sync/sync0sync.c
storage/innobase/trx/trx0i_s.c
storage/innobase/trx/trx0purge.c
storage/innobase/trx/trx0roll.c
storage/innobase/trx/trx0rseg.c
storage/innobase/trx/trx0sys.c
storage/innobase/trx/trx0trx.c
storage/myisam/mi_create.c
storage/perfschema/ha_perfschema.cc
storage/perfschema/pfs.cc
storage/perfschema/pfs_column_types.h
storage/perfschema/pfs_engine_table.cc
storage/perfschema/pfs_engine_table.h
storage/perfschema/pfs_instr.h
storage/perfschema/pfs_instr_class.cc
storage/perfschema/pfs_setup_actor.h
storage/perfschema/pfs_setup_object.h
storage/perfschema/pfs_stat.h
storage/perfschema/pfs_timer.h
storage/perfschema/table_ews_by_thread_by_event_name.cc
storage/perfschema/table_ews_by_thread_by_event_name.h
storage/perfschema/table_ews_global_by_event_name.h
storage/perfschema/table_helper.h
strings/ctype.c
support-files/mysql.spec.sh
unittest/gunit/CMakeLists.txt
unittest/gunit/mdl-t.cc
unittest/gunit/mdl_mytap-t.cc
Diff too large for email (26435 lines, the limit is 10000).
No bundle (reason: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).
| Thread |
|---|
| • bzr commit into mysql-trunk branch (alexander.nozdrin:3527) | Alexander Nozdrin | 15 Feb |
