From: Marc Alff Date: March 18 2011 1:02pm Subject: bzr commit into mysql-trunk branch (marc.alff:3607) List-Archive: http://lists.mysql.com/commits/133303 Message-Id: <201103181302.p2ID2sUT018712@acsmt358.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit #At file:///Users/malff/BZR_TREE/mysql-trunk-stage/ based on revid:georgi.kodinov@stripped 3607 Marc Alff 2011-03-18 [merge] Merge mysql-trunk (revno 3302) --> mysql-trunk-stage removed: include/mysql/service_error_reporting.h libservices/error_reporting_service.c 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/include/have_case_insensitive_fs.inc mysql-test/r/case_insensitive_fs.require mysql-test/r/crash_commit_before.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/dml_file_summary_by_event_name.test mysql-test/suite/perfschema/t/dml_file_summary_by_instance.test mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile-slave.opt mysql-test/t/crash_commit_before-master.opt mysql-test/t/crash_commit_before.test mysql-test/t/partition-master.opt storage/innobase/include/ut0bh.h storage/innobase/ut/ut0bh.c 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/collections/disabled-weekly.list mysql-test/include/check_qep.inc mysql-test/include/execute_with_statistics.inc mysql-test/include/expect_qep.inc mysql-test/r/file_contents.result mysql-test/r/func_encrypt_ucs2.result mysql-test/r/multi_update_innodb.result mysql-test/r/optimizer_debug_sync.result mysql-test/r/partition_explicit_prune.result mysql-test/r/ssl_cipher.result mysql-test/std_data/bug47205.frm mysql-test/suite/binlog/r/binlog_incident_ignore.result mysql-test/suite/binlog/r/rpl_crash_safe_master_checksum.result mysql-test/suite/binlog/t/binlog_incident_ignore-master.opt mysql-test/suite/binlog/t/binlog_incident_ignore.test mysql-test/suite/binlog/t/rpl_crash_safe_master_checksum-master.opt mysql-test/suite/binlog/t/rpl_crash_safe_master_checksum.test mysql-test/suite/innodb/r/innodb-autoinc-56228.result mysql-test/suite/innodb/r/innodb_bug11789106.result mysql-test/suite/innodb/r/innodb_bug53756.result mysql-test/suite/innodb/r/innodb_bug59307.result mysql-test/suite/innodb/r/innodb_bug60049.result mysql-test/suite/innodb/r/innodb_bug60196.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_bug11789106.test mysql-test/suite/innodb/t/innodb_bug53756-master.opt mysql-test/suite/innodb/t/innodb_bug53756.test mysql-test/suite/innodb/t/innodb_bug59307.test mysql-test/suite/innodb/t/innodb_bug60049-master.opt mysql-test/suite/innodb/t/innodb_bug60049.test mysql-test/suite/innodb/t/innodb_bug60196-master.opt mysql-test/suite/innodb/t/innodb_bug60196.test mysql-test/suite/parts/inc/partition-dml-1-1-modes.inc mysql-test/suite/parts/inc/partition-dml-1-1.inc mysql-test/suite/parts/inc/partition-dml-1-10.inc mysql-test/suite/parts/inc/partition-dml-1-11.inc mysql-test/suite/parts/inc/partition-dml-1-2.inc mysql-test/suite/parts/inc/partition-dml-1-3.inc mysql-test/suite/parts/inc/partition-dml-1-4.inc mysql-test/suite/parts/inc/partition-dml-1-5.inc mysql-test/suite/parts/inc/partition-dml-1-6.inc mysql-test/suite/parts/inc/partition-dml-1-7.inc mysql-test/suite/parts/inc/partition-dml-1-8.inc mysql-test/suite/parts/inc/partition-dml-1-9.inc mysql-test/suite/parts/inc/partition-dml_cr_tab.inc mysql-test/suite/parts/inc/partition-dml_ins_tab.inc mysql-test/suite/parts/inc/rpl-partition-dml-1-1.inc mysql-test/suite/parts/r/partition-dml-1-1-innodb-modes.result mysql-test/suite/parts/r/partition-dml-1-1-innodb.result mysql-test/suite/parts/r/partition-dml-1-1-myisam-modes.result mysql-test/suite/parts/r/partition-dml-1-1-myisam.result mysql-test/suite/parts/r/partition-dml-1-10-innodb.result mysql-test/suite/parts/r/partition-dml-1-10-myisam.result mysql-test/suite/parts/r/partition-dml-1-11-innodb.result mysql-test/suite/parts/r/partition-dml-1-11-myisam.result mysql-test/suite/parts/r/partition-dml-1-2-innodb.result mysql-test/suite/parts/r/partition-dml-1-2-myisam.result mysql-test/suite/parts/r/partition-dml-1-3-innodb.result mysql-test/suite/parts/r/partition-dml-1-4-innodb.result mysql-test/suite/parts/r/partition-dml-1-5-innodb.result mysql-test/suite/parts/r/partition-dml-1-6-innodb.result mysql-test/suite/parts/r/partition-dml-1-7-innodb.result mysql-test/suite/parts/r/partition-dml-1-8-innodb.result mysql-test/suite/parts/r/partition-dml-1-9-innodb.result mysql-test/suite/parts/r/partition-dml-1-9-myisam.result mysql-test/suite/parts/r/rpl-partition-dml-1-1-innodb.result mysql-test/suite/parts/r/rpl-partition-dml-1-1-myisam.result mysql-test/suite/parts/t/partition-dml-1-1-innodb-modes.test mysql-test/suite/parts/t/partition-dml-1-1-innodb.test mysql-test/suite/parts/t/partition-dml-1-1-myisam-modes.test mysql-test/suite/parts/t/partition-dml-1-1-myisam.test mysql-test/suite/parts/t/partition-dml-1-10-innodb.test mysql-test/suite/parts/t/partition-dml-1-10-myisam.test mysql-test/suite/parts/t/partition-dml-1-11-innodb.test mysql-test/suite/parts/t/partition-dml-1-11-myisam.test mysql-test/suite/parts/t/partition-dml-1-2-innodb.test mysql-test/suite/parts/t/partition-dml-1-2-myisam.test mysql-test/suite/parts/t/partition-dml-1-3-innodb.test mysql-test/suite/parts/t/partition-dml-1-4-innodb.test mysql-test/suite/parts/t/partition-dml-1-5-innodb.test mysql-test/suite/parts/t/partition-dml-1-6-innodb.test mysql-test/suite/parts/t/partition-dml-1-7-innodb.test mysql-test/suite/parts/t/partition-dml-1-8-innodb.test mysql-test/suite/parts/t/partition-dml-1-9-innodb.test mysql-test/suite/parts/t/partition-dml-1-9-myisam.test mysql-test/suite/parts/t/rpl-partition-dml-1-1-innodb.test mysql-test/suite/parts/t/rpl-partition-dml-1-1-myisam.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/r/relaylog.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/perfschema/t/relaylog.test mysql-test/suite/rpl/r/rpl_crash_safe_master.result mysql-test/suite/rpl/r/rpl_grant_plugin.result mysql-test/suite/rpl/r/rpl_skip_incident.result mysql-test/suite/rpl/t/rpl_crash_safe_master.test mysql-test/suite/rpl/t/rpl_grant_plugin-master.opt mysql-test/suite/rpl/t/rpl_grant_plugin-slave.opt mysql-test/suite/rpl/t/rpl_grant_plugin.test mysql-test/suite/rpl/t/rpl_skip_incident-master.opt mysql-test/suite/rpl/t/rpl_skip_incident-slave.opt mysql-test/suite/rpl/t/rpl_skip_incident.test mysql-test/suite/sys_vars/r/core_file_basic.result mysql-test/suite/sys_vars/r/innodb_change_buffer_max_size_basic.result mysql-test/suite/sys_vars/r/max_long_data_size_basic.result mysql-test/suite/sys_vars/r/secure_file_priv2.result mysql-test/suite/sys_vars/t/core_file_basic-master.opt mysql-test/suite/sys_vars/t/core_file_basic.test mysql-test/suite/sys_vars/t/innodb_change_buffer_max_size_basic.test mysql-test/suite/sys_vars/t/max_long_data_size_basic.test 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/func_encrypt_ucs2.test mysql-test/t/multi_update_innodb.test mysql-test/t/optimizer_debug_sync.test mysql-test/t/partition_explicit_prune.test mysql-test/t/ssl_cipher-master.opt mysql-test/t/ssl_cipher.test storage/innobase/include/ut0bh.h storage/innobase/include/ut0bh.ic storage/innobase/ut/ut0bh.c renamed: regex/tests => regex/tests_include.h unittest/mysys/bitmap-t.c => unittest/gunit/my_bitmap-t.cc modified: .bzrignore CMakeLists.txt README VERSION client/mysql.cc client/mysqladmin.cc client/mysqlcheck.c client/mysqldump.c client/mysqltest.cc client/readline.cc client/sql_string.cc client/sql_string.h cmake/cpack_source_ignore_files.cmake cmake/make_dist.cmake.in cmake/mysql_version.cmake extra/comp_err.c extra/yassl/src/yassl_int.cpp include/ft_global.h include/m_ctype.h include/my_base.h include/my_bit.h include/my_bitmap.h include/my_global.h include/my_handler.h include/my_pthread.h include/my_sys.h include/my_tree.h include/mysql.h.pp include/mysql/plugin_audit.h.pp include/mysql/plugin_auth.h.pp include/mysql/plugin_ftparser.h include/mysql/plugin_ftparser.h.pp include/mysql/services.h include/mysql_embed.h include/service_versions.h include/typelib.h include/welcome_copyright_notice.h libmysqld/lib_sql.cc 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/binlog_tests/binlog.test mysql-test/extra/binlog_tests/ctype_cp932.test mysql-test/extra/binlog_tests/database.test mysql-test/extra/rpl_tests/rpl_binlog_max_cache_size.test mysql-test/extra/rpl_tests/rpl_conflicts.test mysql-test/extra/rpl_tests/rpl_extra_col_master.test mysql-test/extra/rpl_tests/rpl_extra_col_slave.test mysql-test/extra/rpl_tests/rpl_loaddata.test mysql-test/extra/rpl_tests/rpl_row_basic.test mysql-test/extra/rpl_tests/rpl_row_empty_imgs.test mysql-test/extra/rpl_tests/rpl_row_tabledefs.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/ctype_numconv.inc mysql-test/include/have_plugin_auth.inc mysql-test/include/icp_tests.inc mysql-test/include/mtr_warnings.sql mysql-test/include/mysqld--help.inc mysql-test/include/mysqlhotcopy.inc mysql-test/include/subquery_mat.inc mysql-test/include/subquery_sj.inc mysql-test/include/unsafe_binlog.inc mysql-test/include/wait_for_slave_io_error.inc mysql-test/include/wait_for_slave_sql_error.inc mysql-test/include/wait_for_status_var.inc mysql-test/lib/My/Find.pm mysql-test/lib/mtr_cases.pm mysql-test/lib/mtr_report.pm mysql-test/mysql-test-run.pl mysql-test/r/alter_table.result mysql-test/r/archive.result mysql-test/r/archive_plugin.result mysql-test/r/blackhole_plugin.result mysql-test/r/cast.result mysql-test/r/create.result mysql-test/r/ctype_binary.result mysql-test/r/ctype_cp1250_ch.result mysql-test/r/ctype_cp1251.result mysql-test/r/ctype_eucjpms.result mysql-test/r/ctype_latin1.result mysql-test/r/ctype_ldml.result mysql-test/r/ctype_sjis.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/ddl_i18n_koi8r.result mysql-test/r/ddl_i18n_utf8.result mysql-test/r/filesort_debug.result mysql-test/r/flush.result mysql-test/r/flush_read_lock.result mysql-test/r/func_analyse.result mysql-test/r/func_rollback.result mysql-test/r/func_set.result mysql-test/r/func_time.result mysql-test/r/gis.result mysql-test/r/grant.result mysql-test/r/greedy_optimizer.result mysql-test/r/group_by.result mysql-test/r/information_schema.result mysql-test/r/information_schema_parameters.result mysql-test/r/information_schema_routines.result mysql-test/r/innodb_icp.result mysql-test/r/innodb_icp_all.result mysql-test/r/innodb_icp_none.result mysql-test/r/innodb_mysql_sync.result mysql-test/r/insert_select.result mysql-test/r/join.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_jcl6.result mysql-test/r/lock.result mysql-test/r/log_state.result mysql-test/r/log_tables.result mysql-test/r/mdl_sync.result mysql-test/r/multi_update.result mysql-test/r/myisam_icp.result mysql-test/r/myisam_icp_all.result mysql-test/r/myisam_icp_none.result mysql-test/r/mysqladmin.result mysql-test/r/mysqlcheck.result mysql-test/r/mysqld--help-notwin.result mysql-test/r/mysqld--help-win.result mysql-test/r/mysqldump.result mysql-test/r/mysqltest.result mysql-test/r/negation_elimination.result mysql-test/r/partition.result mysql-test/r/partition_error.result mysql-test/r/partition_exchange.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/select_safe.result mysql-test/r/signal_code.result mysql-test/r/sp-code.result mysql-test/r/sp-error.result mysql-test/r/sp.result mysql-test/r/status.result mysql-test/r/subquery_all.result mysql-test/r/subquery_all_jcl6.result mysql-test/r/subquery_mat.result mysql-test/r/subquery_mat_all.result mysql-test/r/subquery_mat_none.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_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/subselect_innodb.result mysql-test/r/system_mysql_db.result mysql-test/r/trigger.result mysql-test/r/type_date.result mysql-test/r/type_year.result mysql-test/r/union.result mysql-test/r/unsafe_binlog_innodb.result mysql-test/r/user_var.result mysql-test/r/variables.result mysql-test/r/xa.result mysql-test/r/xml.result mysql-test/std_data/Index.xml mysql-test/suite/binlog/r/binlog_base64_flag.result mysql-test/suite/binlog/r/binlog_database.result mysql-test/suite/binlog/r/binlog_index.result mysql-test/suite/binlog/r/binlog_row_binlog.result mysql-test/suite/binlog/r/binlog_stm_binlog.result mysql-test/suite/binlog/r/binlog_unsafe.result mysql-test/suite/binlog/t/binlog_base64_flag.test mysql-test/suite/binlog/t/binlog_delete_and_flush_index.test mysql-test/suite/binlog/t/binlog_index.test mysql-test/suite/binlog/t/binlog_unsafe.test mysql-test/suite/engines/iuds/r/insert_year.result mysql-test/suite/engines/iuds/t/disabled.def mysql-test/suite/funcs_1/r/innodb_storedproc_06.result mysql-test/suite/funcs_1/r/is_columns_is.result mysql-test/suite/funcs_1/r/is_columns_is_embedded.result mysql-test/suite/funcs_1/r/is_columns_myisam_embedded.result mysql-test/suite/funcs_1/r/is_columns_mysql.result mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result mysql-test/suite/funcs_1/r/is_routines.result mysql-test/suite/funcs_1/r/is_statistics_mysql_embedded.result mysql-test/suite/funcs_1/r/is_table_constraints_mysql_embedded.result mysql-test/suite/funcs_1/r/is_tables_mysql_embedded.result mysql-test/suite/funcs_1/r/memory_storedproc_06.result mysql-test/suite/funcs_1/r/myisam_storedproc_06.result mysql-test/suite/funcs_1/storedproc/storedproc_06.inc mysql-test/suite/innodb/include/innodb_stats_bootstrap.inc mysql-test/suite/innodb/r/innodb.result mysql-test/suite/innodb/r/innodb_monitor.result mysql-test/suite/innodb/t/innodb.test mysql-test/suite/innodb/t/innodb_information_schema.test mysql-test/suite/innodb/t/innodb_monitor.test mysql-test/suite/large_tests/r/rpl_slave_net_timeout.result mysql-test/suite/large_tests/t/lock_tables_big.test mysql-test/suite/large_tests/t/rpl_slave_net_timeout.test mysql-test/suite/parts/inc/partition_fail.inc mysql-test/suite/parts/r/partition_exch_qa_13.result mysql-test/suite/parts/r/partition_exch_qa_2.result mysql-test/suite/parts/r/partition_mgm_lc0_archive.result mysql-test/suite/parts/r/partition_mgm_lc0_innodb.result mysql-test/suite/parts/r/partition_mgm_lc0_memory.result mysql-test/suite/parts/r/partition_mgm_lc0_myisam.result mysql-test/suite/parts/r/partition_mgm_lc1_archive.result mysql-test/suite/parts/r/partition_mgm_lc1_innodb.result mysql-test/suite/parts/r/partition_mgm_lc1_memory.result mysql-test/suite/parts/r/partition_mgm_lc1_myisam.result mysql-test/suite/parts/r/partition_mgm_lc2_archive.result mysql-test/suite/parts/r/partition_mgm_lc2_innodb.result mysql-test/suite/parts/r/partition_mgm_lc2_memory.result mysql-test/suite/parts/r/partition_mgm_lc2_myisam.result mysql-test/suite/parts/r/partition_repair_myisam.result mysql-test/suite/parts/t/partition_debug_myisam.test mysql-test/suite/parts/t/partition_exch_qa_14.test mysql-test/suite/parts/t/partition_repair_myisam.test mysql-test/suite/perfschema/include/event_aggregate_setup.inc mysql-test/suite/perfschema/include/table_aggregate_load.inc mysql-test/suite/perfschema/include/table_aggregate_setup.inc 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/server_init.result mysql-test/suite/perfschema/t/server_init.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_bug33931.result mysql-test/suite/rpl/r/rpl_checksum.result mysql-test/suite/rpl/r/rpl_checksum_cache.result mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result mysql-test/suite/rpl/r/rpl_corruption.result mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result mysql-test/suite/rpl/r/rpl_extra_col_slave_innodb.result mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.result mysql-test/suite/rpl/r/rpl_filter_tables_not_exist.result mysql-test/suite/rpl/r/rpl_heartbeat_basic.result mysql-test/suite/rpl/r/rpl_idempotency.result mysql-test/suite/rpl/r/rpl_ignore_table.result mysql-test/suite/rpl/r/rpl_incident.result mysql-test/suite/rpl/r/rpl_init_slave_errors.result mysql-test/suite/rpl/r/rpl_known_bugs_detection.result mysql-test/suite/rpl/r/rpl_loaddata.result mysql-test/suite/rpl/r/rpl_loaddata_fatal.result mysql-test/suite/rpl/r/rpl_loaddatalocal.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_rotate_logs.result mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result mysql-test/suite/rpl/r/rpl_row_colSize.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_row_idempotency.result mysql-test/suite/rpl/r/rpl_row_img_eng_full.result mysql-test/suite/rpl/r/rpl_row_img_sanity.result mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result mysql-test/suite/rpl/r/rpl_show_errors.result mysql-test/suite/rpl/r/rpl_skip_error.result mysql-test/suite/rpl/r/rpl_slave_grp_exec.result mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result mysql-test/suite/rpl/r/rpl_slave_load_tmpdir_not_exist.result mysql-test/suite/rpl/r/rpl_slave_start.result mysql-test/suite/rpl/r/rpl_slow_query_log.result mysql-test/suite/rpl/r/rpl_stm_000001.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/r/rpl_stm_conflicts.result mysql-test/suite/rpl/r/rpl_stm_loaddata_concurrent.result mysql-test/suite/rpl/r/rpl_stm_start_stop_slave.result mysql-test/suite/rpl/r/rpl_stm_stop_middle_group.result mysql-test/suite/rpl/r/rpl_stop_slave.result mysql-test/suite/rpl/r/rpl_temporary_errors.result mysql-test/suite/rpl/r/rpl_typeconv.result mysql-test/suite/rpl/t/disabled.def mysql-test/suite/rpl/t/rpl_binlog_corruption.test mysql-test/suite/rpl/t/rpl_bug33931.test mysql-test/suite/rpl/t/rpl_checksum.test mysql-test/suite/rpl/t/rpl_checksum_cache.test mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test mysql-test/suite/rpl/t/rpl_corruption.test mysql-test/suite/rpl/t/rpl_filter_tables_not_exist.test mysql-test/suite/rpl/t/rpl_heartbeat_basic.test mysql-test/suite/rpl/t/rpl_idempotency.test mysql-test/suite/rpl/t/rpl_ignore_table.test mysql-test/suite/rpl/t/rpl_incident.test mysql-test/suite/rpl/t/rpl_init_slave_errors.test mysql-test/suite/rpl/t/rpl_known_bugs_detection.test mysql-test/suite/rpl/t/rpl_loaddata_fatal.test mysql-test/suite/rpl/t/rpl_loaddatalocal.test mysql-test/suite/rpl/t/rpl_manual_change_index_file.test mysql-test/suite/rpl/t/rpl_rotate_logs.test mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test mysql-test/suite/rpl/t/rpl_row_colSize.test mysql-test/suite/rpl/t/rpl_row_idempotency.test mysql-test/suite/rpl/t/rpl_row_img_sanity.test mysql-test/suite/rpl/t/rpl_row_inexist_tbl.test mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test mysql-test/suite/rpl/t/rpl_semi_sync.test mysql-test/suite/rpl/t/rpl_show_errors.test mysql-test/suite/rpl/t/rpl_skip_error.test mysql-test/suite/rpl/t/rpl_slave_grp_exec.test mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test mysql-test/suite/rpl/t/rpl_slave_load_tmpdir_not_exist.test mysql-test/suite/rpl/t/rpl_slave_start.test mysql-test/suite/rpl/t/rpl_slow_query_log.test mysql-test/suite/rpl/t/rpl_stm_000001.test mysql-test/suite/rpl/t/rpl_stm_start_stop_slave.test mysql-test/suite/rpl/t/rpl_stop_slave.test mysql-test/suite/rpl/t/rpl_temporary_errors.test mysql-test/suite/rpl/t/rpl_typeconv.test mysql-test/suite/sys_vars/r/all_vars.result mysql-test/suite/sys_vars/r/max_binlog_stmt_cache_size_basic.result mysql-test/suite/sys_vars/r/max_join_size_func.result mysql-test/suite/sys_vars/r/optimizer_switch_basic.result mysql-test/suite/sys_vars/r/slow_query_log_func.result mysql-test/suite/sys_vars/r/sql_big_selects_func.result mysql-test/suite/sys_vars/t/optimizer_switch_basic.test mysql-test/suite/sys_vars/t/pfs_events_waits_history_long_size_basic-master.opt mysql-test/suite/sys_vars/t/pfs_events_waits_history_size_basic-master.opt mysql-test/suite/sys_vars/t/pfs_max_cond_classes_basic-master.opt mysql-test/suite/sys_vars/t/pfs_max_cond_instances_basic-master.opt mysql-test/suite/sys_vars/t/pfs_max_file_classes_basic-master.opt mysql-test/suite/sys_vars/t/pfs_max_file_handles_basic-master.opt mysql-test/suite/sys_vars/t/pfs_max_file_instances_basic-master.opt mysql-test/suite/sys_vars/t/pfs_max_mutex_classes_basic-master.opt mysql-test/suite/sys_vars/t/pfs_max_mutex_instances_basic-master.opt mysql-test/suite/sys_vars/t/pfs_max_rwlock_classes_basic-master.opt mysql-test/suite/sys_vars/t/pfs_max_rwlock_instances_basic-master.opt mysql-test/suite/sys_vars/t/pfs_max_table_handles_basic-master.opt mysql-test/suite/sys_vars/t/pfs_max_table_instances_basic-master.opt mysql-test/suite/sys_vars/t/pfs_max_thread_classes_basic-master.opt mysql-test/suite/sys_vars/t/pfs_max_thread_instances_basic-master.opt mysql-test/suite/sys_vars/t/slow_query_log_func.test mysql-test/t/alter_table.test mysql-test/t/archive.test mysql-test/t/archive_plugin.test mysql-test/t/blackhole_plugin.test mysql-test/t/cast.test mysql-test/t/create.test mysql-test/t/ctype_cp1250_ch.test mysql-test/t/ctype_cp1251.test mysql-test/t/ctype_eucjpms.test mysql-test/t/ctype_latin1.test mysql-test/t/ctype_ldml.test mysql-test/t/ctype_sjis.test mysql-test/t/ctype_ucs.test mysql-test/t/ctype_utf16.test mysql-test/t/ctype_utf32.test mysql-test/t/ctype_utf8.test mysql-test/t/disabled.def mysql-test/t/filesort_debug.test mysql-test/t/flush.test mysql-test/t/flush_read_lock.test mysql-test/t/func_analyse.test mysql-test/t/func_rollback.test mysql-test/t/func_set.test mysql-test/t/func_time.test mysql-test/t/gis.test mysql-test/t/grant.test mysql-test/t/grant_lowercase_fs.test mysql-test/t/greedy_optimizer.test mysql-test/t/group_by.test mysql-test/t/information_schema.test mysql-test/t/innodb_mysql_sync.test mysql-test/t/insert_select.test mysql-test/t/lock.test mysql-test/t/log_state.test mysql-test/t/log_tables.test mysql-test/t/mdl_sync.test mysql-test/t/multi_update.test mysql-test/t/mysql.test mysql-test/t/mysql_client_test-master.opt mysql-test/t/mysql_client_test.test mysql-test/t/mysql_cp932.test mysql-test/t/mysqladmin.test mysql-test/t/mysqlbinlog-cp932.test mysql-test/t/mysqlbinlog_raw_mode.test mysql-test/t/mysqlcheck.test mysql-test/t/mysqldump.test mysql-test/t/mysqltest.test mysql-test/t/negation_elimination.test mysql-test/t/partition.test mysql-test/t/partition_binlog.test mysql-test/t/partition_error.test mysql-test/t/partition_mgm_err2.test mysql-test/t/plugin_auth.test mysql-test/t/plugin_auth_qa_1.test mysql-test/t/ps.test mysql-test/t/repair.test mysql-test/t/show_check.test mysql-test/t/sp-error.test mysql-test/t/sp.test mysql-test/t/subselect_innodb.test mysql-test/t/trigger.test mysql-test/t/type_date.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/t/xml.test mysql-test/valgrind.supp mysys/charset.c mysys/default.c mysys/hash.c mysys/mf_qsort.c mysys/my_bitmap.c mysys/my_conio.c mysys/my_fopen.c mysys/my_getopt.c mysys/my_getsystime.c mysys/my_handler.c mysys/my_handler_errors.h mysys/my_init.c mysys/my_rename.c mysys/my_thr_init.c mysys/mysys_priv.h mysys/stacktrace.c mysys/tree.c mysys/typelib.c plugin/auth/auth_socket.c plugin/auth/test_plugin.c regex/CMakeLists.txt regex/debug.c regex/debug.ih regex/engine.c regex/engine.ih regex/main.c regex/my_regex.h regex/regcomp.c regex/regcomp.ih regex/reginit.c scripts/mysql_system_tables.sql scripts/mysql_system_tables_fix.sql scripts/mysqld_multi.sh scripts/mysqldumpslow.sh sql-common/client.c sql-common/client_plugin.c sql/binlog.cc sql/binlog.h sql/event_data_objects.cc sql/event_db_repository.cc sql/field.cc sql/field.h sql/field_conv.cc sql/filesort.cc sql/gstream.h sql/ha_ndbcluster_cond.cc sql/ha_partition.cc sql/ha_partition.h sql/handler.cc sql/handler.h sql/item.cc sql/item.h sql/item_cmpfunc.cc sql/item_cmpfunc.h sql/item_create.cc sql/item_create.h sql/item_func.cc sql/item_func.h sql/item_geofunc.h 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/item_timefunc.cc sql/item_timefunc.h sql/item_xmlfunc.cc sql/key.cc sql/log.cc sql/log.h sql/log_event.cc sql/log_event.h sql/my_decimal.cc sql/my_decimal.h sql/mysqld.cc sql/mysqld.h sql/net_serv.cc sql/opt_range.cc sql/partition_info.cc sql/partition_info.h sql/procedure.h sql/protocol.cc sql/protocol.h sql/rpl_master.cc sql/rpl_rli.cc sql/rpl_slave.cc sql/rpl_slave.h sql/rpl_utility.cc sql/set_var.cc sql/set_var.h sql/share/errmsg-utf8.txt sql/sp.cc sql/sp.h sql/sp_head.cc sql/sp_head.h sql/sql_acl.cc sql/sql_admin.cc sql/sql_analyse.cc sql/sql_audit.h sql/sql_base.cc sql/sql_base.h sql/sql_class.cc sql/sql_class.h sql/sql_cmd.h sql/sql_connect.cc sql/sql_connect.h sql/sql_db.cc sql/sql_db.h sql/sql_delete.cc sql/sql_error.cc sql/sql_error.h sql/sql_handler.cc sql/sql_help.cc sql/sql_lex.cc sql/sql_lex.h sql/sql_load.cc sql/sql_parse.cc sql/sql_parse.h sql/sql_partition.cc sql/sql_partition.h sql/sql_partition_admin.cc sql/sql_plugin.cc sql/sql_plugin.h sql/sql_plugin_services.h sql/sql_prepare.cc sql/sql_reload.cc sql/sql_select.cc sql/sql_select.h sql/sql_show.cc sql/sql_signal.cc sql/sql_sort.h sql/sql_string.cc sql/sql_string.h sql/sql_table.cc sql/sql_table.h sql/sql_time.cc sql/sql_time.h sql/sql_trigger.cc sql/sql_truncate.cc sql/sql_union.cc sql/sql_update.cc sql/sql_view.cc sql/sql_yacc.yy sql/strfunc.cc sql/strfunc.h sql/sys_vars.cc sql/sys_vars.h sql/table.cc sql/table.h sql/thr_malloc.cc sql/thr_malloc.h sql/transaction.cc sql/uniques.cc storage/archive/ha_archive.cc storage/archive/ha_archive.h storage/csv/ha_tina.h storage/federated/ha_federated.h storage/heap/hp_hash.c 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/buf0flu.c storage/innobase/buf/buf0lru.c storage/innobase/buf/buf0rea.c storage/innobase/dict/dict0dict.c storage/innobase/dict/dict0load.c storage/innobase/dict/dict0mem.c storage/innobase/dict/dict0stats.c storage/innobase/fil/fil0fil.c storage/innobase/fsp/fsp0fsp.c storage/innobase/ha/ha0ha.c storage/innobase/handler/ha_innodb.cc storage/innobase/handler/handler0alter.cc storage/innobase/handler/i_s.cc storage/innobase/handler/i_s.h storage/innobase/ibuf/ibuf0ibuf.c storage/innobase/include/btr0btr.h storage/innobase/include/btr0cur.h storage/innobase/include/btr0cur.ic storage/innobase/include/btr0types.h storage/innobase/include/buf0buf.h storage/innobase/include/buf0buf.ic storage/innobase/include/buf0flu.h storage/innobase/include/buf0flu.ic storage/innobase/include/buf0lru.h storage/innobase/include/data0type.ic storage/innobase/include/dict0dict.h storage/innobase/include/dict0load.h storage/innobase/include/dict0mem.h storage/innobase/include/dict0priv.ic storage/innobase/include/dict0types.h storage/innobase/include/fil0fil.h storage/innobase/include/ha0ha.h storage/innobase/include/ha_prototypes.h storage/innobase/include/ibuf0ibuf.h storage/innobase/include/ibuf0ibuf.ic storage/innobase/include/log0log.h storage/innobase/include/log0log.ic storage/innobase/include/log0recv.h storage/innobase/include/mtr0mtr.h storage/innobase/include/os0sync.h storage/innobase/include/os0sync.ic storage/innobase/include/page0zip.h storage/innobase/include/rem0cmp.h storage/innobase/include/rem0cmp.ic storage/innobase/include/row0upd.h storage/innobase/include/srv0mon.h storage/innobase/include/srv0mon.ic storage/innobase/include/srv0srv.h storage/innobase/include/srv0start.h storage/innobase/include/sync0sync.h storage/innobase/include/trx0purge.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/univ.i storage/innobase/include/ut0vec.h storage/innobase/include/ut0vec.ic storage/innobase/lock/lock0lock.c storage/innobase/lock/lock0wait.c storage/innobase/log/log0log.c storage/innobase/log/log0recv.c storage/innobase/mem/mem0dbg.c storage/innobase/mem/mem0mem.c storage/innobase/mtr/mtr0mtr.c storage/innobase/os/os0sync.c storage/innobase/page/page0cur.c storage/innobase/page/page0page.c storage/innobase/page/page0zip.c storage/innobase/que/que0que.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/scripts/persistent_storage.sql storage/innobase/srv/srv0mon.c 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/trx0purge.c storage/innobase/trx/trx0roll.c storage/innobase/trx/trx0rseg.c storage/innobase/trx/trx0sys.c storage/innobase/trx/trx0trx.c storage/innobase/ut/ut0dbg.c storage/innobase/ut/ut0mem.c storage/innobase/ut/ut0ut.c storage/myisam/ft_boolean_search.c storage/myisam/ft_nlq_search.c storage/myisam/ft_parser.c storage/myisam/ft_static.c storage/myisam/ft_update.c storage/myisam/ftdefs.h storage/myisam/ha_myisam.cc storage/myisam/mi_create.c storage/myisam/mi_key.c storage/myisam/myisamchk.c storage/myisammrg/myrg_open.c 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 storage/perfschema/unittest/pfs_timer-t.cc strings/ctype-big5.c strings/ctype-bin.c strings/ctype-cp932.c strings/ctype-czech.c strings/ctype-euc_kr.c strings/ctype-eucjpms.c strings/ctype-gb2312.c strings/ctype-gbk.c strings/ctype-latin1.c strings/ctype-mb.c strings/ctype-simple.c strings/ctype-sjis.c strings/ctype-tis620.c strings/ctype-uca.c strings/ctype-ucs2.c strings/ctype-ujis.c strings/ctype-utf8.c strings/ctype-win1250ch.c strings/ctype.c strings/my_strchr.c strings/my_vsnprintf.c strings/uca-dump.c strings/xml.c support-files/mysql.spec.sh tests/mysql_client_test.c unittest/README.txt unittest/gunit/CMakeLists.txt unittest/gunit/item-t.cc unittest/mysys/CMakeLists.txt unittest/mysys/my_vsnprintf-t.c regex/tests_include.h unittest/gunit/my_bitmap-t.cc Diff too large for email (78865 lines, the limit is 10000). No bundle (reason: revision is a merge).