From: Bjorn Munch Date: December 17 2010 9:39am Subject: bzr commit into mysql-5.5-mtr branch (bjorn.munch:3128) List-Archive: http://lists.mysql.com/commits/127148 Message-Id: <201012170939.oBH9dfSj014362@khepri15.norway.sun.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit #At file:///home/bm136801/my/upd-55/ based on revid:bjorn.munch@stripped 3128 Bjorn Munch 2010-12-17 [merge] merge from 5.5 main removed: BUILD/Makefile.am Docs/Makefile.am EXCEPTIONS-CLIENT Makefile.am client/Makefile.am cmake/Makefile.am cmd-line-utils/Makefile.am cmd-line-utils/libedit/Makefile.am cmd-line-utils/readline/Makefile.am config/ config/ac-macros/ config/ac-macros/alloca.m4 config/ac-macros/character_sets.m4 config/ac-macros/check_cpu.m4 config/ac-macros/compiler_flag.m4 config/ac-macros/dtrace.m4 config/ac-macros/large_file.m4 config/ac-macros/maintainer.m4 config/ac-macros/misc.m4 config/ac-macros/plugins.m4 config/ac-macros/readline.m4 config/ac-macros/ssl.m4 config/ac-macros/zlib.m4 configure.in dbug/Makefile.am extra/Makefile.am extra/yassl/Makefile.am extra/yassl/src/Makefile.am extra/yassl/taocrypt/Makefile.am extra/yassl/taocrypt/benchmark/Makefile.am extra/yassl/taocrypt/src/Makefile.am extra/yassl/taocrypt/test/Makefile.am extra/yassl/testsuite/Makefile.am include/Makefile.am libmysql/Makefile.am libmysql/Makefile.shared libmysql/acinclude.m4 libmysql_r/ libmysql_r/Makefile.am libmysqld/Makefile.am libmysqld/examples/Makefile.am libservices/Makefile.am man/Makefile.am mysql-test/Makefile.am mysql-test/lib/My/SafeProcess/Makefile.am mysql-test/suite/ibmdb2i/ mysql-test/suite/ibmdb2i/include/ mysql-test/suite/ibmdb2i/include/have_i54.inc mysql-test/suite/ibmdb2i/include/have_i61.inc mysql-test/suite/ibmdb2i/include/have_ibmdb2i.inc mysql-test/suite/ibmdb2i/r/ mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_44020.result mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_44025.result mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_44232.result mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_44610.result mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_45196.result mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_45793.result mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_45983.result mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_49329.result mysql-test/suite/ibmdb2i/r/ibmdb2i_collations.result mysql-test/suite/ibmdb2i/t/ mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_44020.test mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_44025.test mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_44232.test mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_44610.test mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_45196.test mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_45793.test mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_45983.test mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_49329.test mysql-test/suite/ibmdb2i/t/ibmdb2i_collations.test mysql-test/suite/innodb/r/innodb_bug54679.result mysql-test/suite/innodb/t/innodb_bug54679.test mysql-test/t/flush_read_lock_kill-master.opt mysys/Makefile.am packaging/Makefile.am plugin/Makefile.am plugin/audit_null/Makefile.am plugin/audit_null/plug.in plugin/auth/Makefile.am plugin/auth/plug.in plugin/daemon_example/Makefile.am plugin/daemon_example/configure.in plugin/daemon_example/plug.in plugin/fulltext/Makefile.am plugin/fulltext/configure.in plugin/fulltext/plug.in plugin/semisync/Makefile.am plugin/semisync/configure.in plugin/semisync/plug.in regex/Makefile.am scripts/Makefile.am scripts/make_sharedlib_distribution.sh sql-bench/Makefile.am sql-common/Makefile.am sql/Makefile.am sql/share/Makefile.am storage/Makefile.am storage/archive/Makefile.am storage/archive/plug.in storage/blackhole/Makefile.am storage/blackhole/plug.in storage/csv/Makefile.am storage/csv/plug.in storage/example/Makefile.am storage/example/plug.in storage/federated/Makefile.am storage/federated/plug.in storage/heap/Makefile.am storage/heap/plug.in storage/ibmdb2i/ storage/ibmdb2i/CMakeLists.txt storage/ibmdb2i/Makefile.am storage/ibmdb2i/db2i_blobCollection.cc storage/ibmdb2i/db2i_blobCollection.h storage/ibmdb2i/db2i_charsetSupport.cc storage/ibmdb2i/db2i_charsetSupport.h storage/ibmdb2i/db2i_collationSupport.cc storage/ibmdb2i/db2i_collationSupport.h storage/ibmdb2i/db2i_constraints.cc storage/ibmdb2i/db2i_conversion.cc storage/ibmdb2i/db2i_errors.cc storage/ibmdb2i/db2i_errors.h storage/ibmdb2i/db2i_file.cc storage/ibmdb2i/db2i_file.h storage/ibmdb2i/db2i_global.h storage/ibmdb2i/db2i_iconv.h storage/ibmdb2i/db2i_ileBridge.cc storage/ibmdb2i/db2i_ileBridge.h storage/ibmdb2i/db2i_ioBuffers.cc storage/ibmdb2i/db2i_ioBuffers.h storage/ibmdb2i/db2i_misc.h storage/ibmdb2i/db2i_myconv.cc storage/ibmdb2i/db2i_myconv.h storage/ibmdb2i/db2i_rir.cc storage/ibmdb2i/db2i_safeString.h storage/ibmdb2i/db2i_sqlStatementStream.cc storage/ibmdb2i/db2i_sqlStatementStream.h storage/ibmdb2i/db2i_validatedPointer.h storage/ibmdb2i/ha_ibmdb2i.cc storage/ibmdb2i/ha_ibmdb2i.h storage/ibmdb2i/plug.in storage/innobase/Makefile.am storage/innobase/handler/mysql_addons.cc storage/innobase/include/mysql_addons.h storage/innobase/mysql-test/ storage/innobase/mysql-test/patches/ storage/innobase/mysql-test/patches/README storage/innobase/mysql-test/patches/index_merge_innodb-explain.diff storage/innobase/mysql-test/patches/information_schema.diff storage/innobase/mysql-test/patches/innodb_change_buffering_basic.diff storage/innobase/mysql-test/patches/innodb_file_per_table.diff storage/innobase/mysql-test/patches/innodb_lock_wait_timeout.diff storage/innobase/mysql-test/patches/innodb_thread_concurrency_basic.diff storage/innobase/mysql-test/patches/partition_innodb.diff storage/innobase/plug.in storage/myisam/Makefile.am storage/myisam/plug.in storage/myisammrg/Makefile.am storage/myisammrg/plug.in storage/perfschema/Makefile.am storage/perfschema/plug.in storage/perfschema/unittest/Makefile.am strings/Makefile.am strings/bfill.c strings/bmove.c strings/longlong2str-x86.s strings/longlong2str_asm.c strings/my_strtoll10-x86.s strings/str_test.c strings/strings-x86.s strings/strstr.c strings/strto.c strings/strtol.c strings/strtoll.c strings/strtoul.c strings/strtoull.c support-files/MacOSX/Makefile.am support-files/Makefile.am support-files/RHEL4-SElinux/Makefile.am support-files/SCO/ support-files/SCO/INSTALL.sh support-files/SCO/compile.sh support-files/SCO/doc.sh support-files/SCO/mkpkg.sh support-files/SCO/patch support-files/SCO/pkginfo.ini support-files/SCO/postinstall support-files/SCO/preinstall support-files/SCO/preremove support-files/SCO/prototype.ini support-files/SCO/version tests/Makefile.am unittest/Makefile.am unittest/examples/Makefile.am unittest/mysys/Makefile.am unittest/mytap/Makefile.am unittest/mytap/t/Makefile.am unittest/strings/Makefile.am vio/Makefile.am win/Makefile.am win/README win/build-nmake-x64.bat win/build-nmake.bat win/build-vs71.bat win/build-vs8.bat win/build-vs8_x64.bat win/build-vs9.bat win/build-vs9_x64.bat win/configure.js win/create_manifest.js win/mysql_manifest.cmake zlib/Makefile.am added: VERSION mysql-test/collections/mysql-5.5-bugteam.daily mysql-test/collections/mysql-5.5-bugteam.push mysql-test/extra/rpl_tests/rpl_stop_slave.test mysql-test/include/check_ftwrl_compatible.inc mysql-test/include/check_ftwrl_incompatible.inc mysql-test/include/have_plugin_interface.inc mysql-test/include/have_plugin_server.inc mysql-test/r/bug58669.result mysql-test/r/flush_read_lock.result mysql-test/r/lowercase_table4.result mysql-test/r/plugin_auth_qa.result mysql-test/r/plugin_auth_qa_1.result mysql-test/r/plugin_auth_qa_2.result mysql-test/r/plugin_auth_qa_3.result mysql-test/std_data/bug57108.cnf mysql-test/suite/bugs/r/bug57108.result mysql-test/suite/bugs/t/bug57108-master.opt mysql-test/suite/bugs/t/bug57108.test mysql-test/suite/innodb/r/innodb-create-options.result mysql-test/suite/innodb/r/innodb_bug53046.result mysql-test/suite/innodb/r/innodb_bug56143.result mysql-test/suite/innodb/r/innodb_bug56680.result mysql-test/suite/innodb/r/innodb_bug56947.result mysql-test/suite/innodb/r/innodb_bug57252.result mysql-test/suite/innodb/r/innodb_bug57904.result mysql-test/suite/innodb/t/innodb-create-options.test mysql-test/suite/innodb/t/innodb_bug53046.test mysql-test/suite/innodb/t/innodb_bug56143.test mysql-test/suite/innodb/t/innodb_bug56680.test mysql-test/suite/innodb/t/innodb_bug56947.test mysql-test/suite/innodb/t/innodb_bug57252.test mysql-test/suite/innodb/t/innodb_bug57904.test mysql-test/suite/rpl/r/rpl_stop_slave.result mysql-test/suite/rpl/t/rpl_stop_slave.test mysql-test/suite/sys_vars/inc/autocommit_func2.inc mysql-test/suite/sys_vars/r/autocommit_func2.result mysql-test/suite/sys_vars/r/autocommit_func3.result mysql-test/suite/sys_vars/t/autocommit_func2-master.opt mysql-test/suite/sys_vars/t/autocommit_func2.test mysql-test/suite/sys_vars/t/autocommit_func3-master.opt mysql-test/suite/sys_vars/t/autocommit_func3.test mysql-test/t/bug58669-master.opt mysql-test/t/bug58669.test mysql-test/t/flush_read_lock.test mysql-test/t/lowercase_table4-master.opt mysql-test/t/lowercase_table4.test mysql-test/t/plugin_auth_qa-master.opt mysql-test/t/plugin_auth_qa.test mysql-test/t/plugin_auth_qa_1-master.opt mysql-test/t/plugin_auth_qa_1.test mysql-test/t/plugin_auth_qa_2-master.opt mysql-test/t/plugin_auth_qa_2.test mysql-test/t/plugin_auth_qa_3-master.opt mysql-test/t/plugin_auth_qa_3.test mysql-test/t/wl4435_generated.inc plugin/auth/qa_auth_client.c plugin/auth/qa_auth_interface.c plugin/auth/qa_auth_server.c storage/perfschema/unittest/stub_server_misc.h modified: .bzrignore BUILD/FINISH.sh BUILD/SETUP.sh BUILD/autorun.sh BUILD/cmake_configure.sh BUILD/compile-amd64-valgrind-max BUILD/compile-pentium-valgrind-max BUILD/compile-pentium-valgrind-max-no-ndb BUILD/compile-pentium64-valgrind-max CMakeLists.txt README client/mysql.cc client/mysqlbinlog.cc client/mysqltest.cc client/sql_string.h cmake/abi_check.cmake cmake/build_configurations/mysql_release.cmake cmake/configure.pl cmake/install_layout.cmake cmake/install_macros.cmake cmake/libutils.cmake cmake/make_dist.cmake.in cmake/mysql_add_executable.cmake cmake/mysql_version.cmake cmake/os/Linux.cmake cmake/os/Windows.cmake cmake/os/WindowsCache.cmake cmake/plugin.cmake cmake/versioninfo.rc.in cmd-line-utils/libedit/common.c cmd-line-utils/libedit/readline.c cmd-line-utils/libedit/vi.c cmd-line-utils/readline/bind.c cmd-line-utils/readline/complete.c cmd-line-utils/readline/histexpand.c cmd-line-utils/readline/histfile.c cmd-line-utils/readline/isearch.c cmd-line-utils/readline/parens.c cmd-line-utils/readline/readline.c cmd-line-utils/readline/terminal.c cmd-line-utils/readline/text.c configure.cmake dbug/dbug.c include/m_string.h include/my_compiler.h include/my_dbug.h include/my_getopt.h include/my_pthread.h include/my_sys.h include/mysql.h include/mysql/client_plugin.h include/mysql/client_plugin.h.pp include/mysql/plugin_auth.h include/mysql_com.h libmysql/CMakeLists.txt libmysql/conf_to_src.c libmysql/errmsg.c libmysql/get_password.c libmysql/libmysql.c libmysqld/lib_sql.cc libservices/CMakeLists.txt man/CMakeLists.txt mysql-test/CMakeLists.txt mysql-test/collections/default.experimental mysql-test/collections/default.weekly mysql-test/extra/rpl_tests/rpl_insert_id_pk.test mysql-test/extra/rpl_tests/rpl_row_sp003.test mysql-test/extra/rpl_tests/rpl_start_stop_slave.test mysql-test/include/ctype_numconv.inc mysql-test/include/handler.inc mysql-test/include/mtr_warnings.sql mysql-test/include/wait_show_condition.inc mysql-test/mysql-test-run.pl mysql-test/r/1st.result mysql-test/r/connect.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_ujis.result mysql-test/r/ctype_utf16.result mysql-test/r/ctype_utf8.result mysql-test/r/date_formats.result mysql-test/r/delayed.result mysql-test/r/errors.result mysql-test/r/events_2.result mysql-test/r/explain.result mysql-test/r/flush.result mysql-test/r/flush_read_lock_kill.result mysql-test/r/fulltext.result mysql-test/r/func_gconcat.result mysql-test/r/func_math.result mysql-test/r/func_misc.result mysql-test/r/func_time.result mysql-test/r/grant.result mysql-test/r/grant3.result mysql-test/r/group_by.result mysql-test/r/handler_innodb.result mysql-test/r/handler_myisam.result mysql-test/r/information_schema-big.result mysql-test/r/information_schema.result mysql-test/r/ipv4_as_ipv6.result mysql-test/r/join_outer.result mysql-test/r/keywords.result mysql-test/r/kill.result mysql-test/r/lock_sync.result mysql-test/r/log_tables.result mysql-test/r/log_tables_upgrade.result mysql-test/r/mdl_sync.result mysql-test/r/mysql_upgrade.result mysql-test/r/mysql_upgrade_ssl.result mysql-test/r/mysqlbinlog.result mysql-test/r/mysqlcheck.result mysql-test/r/mysqld--help-notwin.result mysql-test/r/mysqld--help-win.result mysql-test/r/mysqltest.result mysql-test/r/not_embedded_server.result mysql-test/r/partition.result mysql-test/r/partition_debug_sync.result mysql-test/r/partition_innodb.result mysql-test/r/partition_innodb_plugin.result mysql-test/r/plugin_auth.result mysql-test/r/ps.result mysql-test/r/select.result mysql-test/r/show_check.result mysql-test/r/signal.result mysql-test/r/sp-bugs.result mysql-test/r/sp-destruct.result mysql-test/r/sp-error.result mysql-test/r/sp-lock.result mysql-test/r/sp-security.result mysql-test/r/subselect.result mysql-test/r/system_mysql_db.result mysql-test/r/trigger.result mysql-test/r/truncate_coverage.result mysql-test/r/type_blob.result mysql-test/r/type_date.result mysql-test/r/user_var.result mysql-test/r/variables-big.result mysql-test/r/xml.result mysql-test/suite/binlog/t/disabled.def mysql-test/suite/funcs_1/r/innodb_storedproc_06.result mysql-test/suite/funcs_1/r/innodb_trig_08.result 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/funcs_1/r/memory_storedproc_06.result mysql-test/suite/funcs_1/r/memory_trig_08.result mysql-test/suite/funcs_1/r/myisam_storedproc_06.result mysql-test/suite/funcs_1/r/myisam_trig_08.result mysql-test/suite/funcs_1/storedproc/storedproc_06.inc mysql-test/suite/innodb/r/innodb-zip.result mysql-test/suite/innodb/r/innodb_mysql.result mysql-test/suite/innodb/t/innodb-zip.test mysql-test/suite/innodb/t/innodb_mysql.test mysql-test/suite/parts/inc/partition_auto_increment.inc mysql-test/suite/parts/r/partition_auto_increment_blackhole.result mysql-test/suite/parts/r/partition_auto_increment_innodb.result mysql-test/suite/parts/r/partition_auto_increment_memory.result mysql-test/suite/parts/r/partition_auto_increment_myisam.result mysql-test/suite/perfschema/include/binlog_common.inc mysql-test/suite/perfschema/include/cleanup_helper.inc mysql-test/suite/perfschema/include/privilege.inc mysql-test/suite/perfschema/include/setup_helper.inc mysql-test/suite/perfschema/include/start_server_common.inc mysql-test/suite/perfschema/r/aggregate.result mysql-test/suite/perfschema/r/binlog_mix.result mysql-test/suite/perfschema/r/binlog_row.result mysql-test/suite/perfschema/r/binlog_stmt.result mysql-test/suite/perfschema/r/checksum.result mysql-test/suite/perfschema/r/column_privilege.result mysql-test/suite/perfschema/r/ddl_cond_instances.result mysql-test/suite/perfschema/r/ddl_events_waits_current.result mysql-test/suite/perfschema/r/ddl_events_waits_history.result mysql-test/suite/perfschema/r/ddl_events_waits_history_long.result mysql-test/suite/perfschema/r/ddl_ews_by_instance.result mysql-test/suite/perfschema/r/ddl_ews_by_thread_by_event_name.result mysql-test/suite/perfschema/r/ddl_ews_global_by_event_name.result mysql-test/suite/perfschema/r/ddl_file_instances.result mysql-test/suite/perfschema/r/ddl_fs_by_event_name.result mysql-test/suite/perfschema/r/ddl_fs_by_instance.result mysql-test/suite/perfschema/r/ddl_mutex_instances.result mysql-test/suite/perfschema/r/ddl_performance_timers.result mysql-test/suite/perfschema/r/ddl_rwlock_instances.result mysql-test/suite/perfschema/r/ddl_setup_consumers.result mysql-test/suite/perfschema/r/ddl_setup_instruments.result mysql-test/suite/perfschema/r/ddl_setup_timers.result mysql-test/suite/perfschema/r/ddl_threads.result mysql-test/suite/perfschema/r/dml_cond_instances.result mysql-test/suite/perfschema/r/dml_events_waits_current.result mysql-test/suite/perfschema/r/dml_events_waits_history.result mysql-test/suite/perfschema/r/dml_events_waits_history_long.result mysql-test/suite/perfschema/r/dml_ews_by_instance.result mysql-test/suite/perfschema/r/dml_ews_by_thread_by_event_name.result mysql-test/suite/perfschema/r/dml_ews_global_by_event_name.result mysql-test/suite/perfschema/r/dml_file_instances.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/r/dml_mutex_instances.result mysql-test/suite/perfschema/r/dml_performance_timers.result mysql-test/suite/perfschema/r/dml_rwlock_instances.result mysql-test/suite/perfschema/r/dml_setup_consumers.result mysql-test/suite/perfschema/r/dml_setup_instruments.result mysql-test/suite/perfschema/r/dml_setup_timers.result mysql-test/suite/perfschema/r/dml_threads.result mysql-test/suite/perfschema/r/func_file_io.result mysql-test/suite/perfschema/r/func_mutex.result mysql-test/suite/perfschema/r/global_read_lock.result mysql-test/suite/perfschema/r/information_schema.result mysql-test/suite/perfschema/r/misc.result mysql-test/suite/perfschema/r/myisam_file_io.result mysql-test/suite/perfschema/r/no_threads.result mysql-test/suite/perfschema/r/one_thread_per_con.result mysql-test/suite/perfschema/r/pfs_upgrade.result mysql-test/suite/perfschema/r/privilege.result mysql-test/suite/perfschema/r/query_cache.result mysql-test/suite/perfschema/r/read_only.result mysql-test/suite/perfschema/r/schema.result mysql-test/suite/perfschema/r/selects.result mysql-test/suite/perfschema/r/server_init.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_thread_class.result mysql-test/suite/perfschema/r/start_server_no_thread_inst.result mysql-test/suite/perfschema/r/start_server_off.result mysql-test/suite/perfschema/r/start_server_on.result mysql-test/suite/perfschema/r/tampered_perfschema_table1.result mysql-test/suite/perfschema/t/aggregate.test mysql-test/suite/perfschema/t/checksum.test mysql-test/suite/perfschema/t/column_privilege.test mysql-test/suite/perfschema/t/ddl_cond_instances.test mysql-test/suite/perfschema/t/ddl_events_waits_current.test mysql-test/suite/perfschema/t/ddl_events_waits_history.test mysql-test/suite/perfschema/t/ddl_events_waits_history_long.test mysql-test/suite/perfschema/t/ddl_ews_by_instance.test mysql-test/suite/perfschema/t/ddl_ews_by_thread_by_event_name.test mysql-test/suite/perfschema/t/ddl_ews_global_by_event_name.test mysql-test/suite/perfschema/t/ddl_file_instances.test mysql-test/suite/perfschema/t/ddl_fs_by_event_name.test mysql-test/suite/perfschema/t/ddl_fs_by_instance.test mysql-test/suite/perfschema/t/ddl_mutex_instances.test mysql-test/suite/perfschema/t/ddl_performance_timers.test mysql-test/suite/perfschema/t/ddl_rwlock_instances.test mysql-test/suite/perfschema/t/ddl_setup_consumers.test mysql-test/suite/perfschema/t/ddl_setup_instruments.test mysql-test/suite/perfschema/t/ddl_setup_timers.test mysql-test/suite/perfschema/t/ddl_threads.test mysql-test/suite/perfschema/t/dml_cond_instances.test mysql-test/suite/perfschema/t/dml_events_waits_current.test mysql-test/suite/perfschema/t/dml_events_waits_history.test mysql-test/suite/perfschema/t/dml_events_waits_history_long.test mysql-test/suite/perfschema/t/dml_ews_by_instance.test mysql-test/suite/perfschema/t/dml_ews_by_thread_by_event_name.test mysql-test/suite/perfschema/t/dml_ews_global_by_event_name.test mysql-test/suite/perfschema/t/dml_file_instances.test 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/perfschema/t/dml_mutex_instances.test mysql-test/suite/perfschema/t/dml_performance_timers.test mysql-test/suite/perfschema/t/dml_rwlock_instances.test mysql-test/suite/perfschema/t/dml_setup_consumers.test mysql-test/suite/perfschema/t/dml_setup_instruments.test mysql-test/suite/perfschema/t/dml_setup_timers.test mysql-test/suite/perfschema/t/dml_threads.test mysql-test/suite/perfschema/t/func_file_io.test mysql-test/suite/perfschema/t/func_mutex.test mysql-test/suite/perfschema/t/global_read_lock.test mysql-test/suite/perfschema/t/information_schema.test mysql-test/suite/perfschema/t/misc.test mysql-test/suite/perfschema/t/myisam_file_io.test mysql-test/suite/perfschema/t/no_threads.test mysql-test/suite/perfschema/t/one_thread_per_con.test mysql-test/suite/perfschema/t/privilege.test mysql-test/suite/perfschema/t/query_cache.test mysql-test/suite/perfschema/t/read_only.test mysql-test/suite/perfschema/t/schema.test mysql-test/suite/perfschema/t/selects.test mysql-test/suite/perfschema/t/server_init.test mysql-test/suite/perfschema/t/start_server_no_cond_class.test mysql-test/suite/perfschema/t/start_server_no_cond_inst.test mysql-test/suite/perfschema/t/start_server_no_file_class.test mysql-test/suite/perfschema/t/start_server_no_file_inst.test mysql-test/suite/perfschema/t/start_server_no_mutex_class.test mysql-test/suite/perfschema/t/start_server_no_mutex_inst.test mysql-test/suite/perfschema/t/start_server_no_rwlock_class.test mysql-test/suite/perfschema/t/start_server_no_rwlock_inst.test mysql-test/suite/perfschema/t/start_server_no_thread_class.test mysql-test/suite/perfschema/t/start_server_no_thread_inst.test mysql-test/suite/perfschema/t/tampered_perfschema_table1.test mysql-test/suite/perfschema/t/thread_cache.test mysql-test/suite/rpl/r/rpl_do_grant.result mysql-test/suite/rpl/r/rpl_row_sp003.result mysql-test/suite/rpl/r/rpl_row_trig003.result mysql-test/suite/rpl/r/rpl_stm_start_stop_slave.result mysql-test/suite/rpl/r/rpl_temp_table_mix_row.result mysql-test/suite/rpl/r/rpl_tmp_table_and_DDL.result mysql-test/suite/rpl/t/rpl_do_grant.test mysql-test/suite/rpl/t/rpl_sync.test mysql-test/suite/rpl/t/rpl_temp_table_mix_row.test mysql-test/suite/sys_vars/r/all_vars.result mysql-test/suite/sys_vars/t/all_vars.test mysql-test/t/ctype_latin1.test mysql-test/t/ctype_ujis.test mysql-test/t/ctype_utf8.test mysql-test/t/date_formats.test mysql-test/t/delayed.test mysql-test/t/disabled.def mysql-test/t/errors.test mysql-test/t/events_2.test mysql-test/t/explain.test mysql-test/t/flush.test mysql-test/t/flush_block_commit.test mysql-test/t/flush_block_commit_notembedded.test mysql-test/t/flush_read_lock_kill.test mysql-test/t/fulltext.test mysql-test/t/func_gconcat.test mysql-test/t/func_math.test mysql-test/t/func_misc.test mysql-test/t/func_time.test mysql-test/t/grant.test mysql-test/t/grant3.test mysql-test/t/group_by.test mysql-test/t/information_schema.test mysql-test/t/join_outer.test mysql-test/t/keywords.test mysql-test/t/kill.test mysql-test/t/lock_multi.test mysql-test/t/lock_sync.test mysql-test/t/log_tables.test mysql-test/t/mdl_sync.test mysql-test/t/mysqlbinlog.test mysql-test/t/mysqltest.test mysql-test/t/not_embedded_server.test mysql-test/t/partition.test mysql-test/t/partition_debug_sync.test mysql-test/t/partition_innodb.test mysql-test/t/partition_innodb_plugin.test mysql-test/t/plugin_auth.test mysql-test/t/ps.test mysql-test/t/select.test mysql-test/t/show_check.test mysql-test/t/sp-bugs.test mysql-test/t/sp-destruct.test mysql-test/t/sp-error.test mysql-test/t/sp-lock.test mysql-test/t/sp-security.test mysql-test/t/subselect.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 mysql-test/t/trigger_notembedded.test mysql-test/t/truncate_coverage.test mysql-test/t/type_blob.test mysql-test/t/type_date.test mysql-test/t/user_var.test mysql-test/t/variables-big.test mysql-test/t/xml.test mysys/default.c mysys/mf_iocache.c mysys/mf_keycache.c mysys/my_gethostbyname.c mysys/my_gethwaddr.c mysys/my_getopt.c mysys/my_rdtsc.c mysys/my_symlink.c mysys/my_sync.c mysys/stacktrace.c mysys/thr_mutex.c packaging/WiX/CMakeLists.txt packaging/WiX/create_msi.cmake.in packaging/WiX/mysql_server.wxs.in plugin/auth/CMakeLists.txt plugin/auth/dialog.c plugin/auth/test_plugin.c regex/main.c regex/regexec.c scripts/CMakeLists.txt scripts/make_binary_distribution.sh scripts/make_win_bin_dist scripts/mysql_system_tables.sql scripts/mysql_system_tables_data.sql scripts/mysql_system_tables_fix.sql sql-bench/CMakeLists.txt sql-common/client.c sql-common/client_plugin.c sql-common/my_time.c sql/CMakeLists.txt sql/debug_sync.cc sql/event_data_objects.cc sql/event_data_objects.h sql/event_db_repository.cc sql/event_db_repository.h sql/event_queue.cc sql/events.cc sql/events.h sql/field.cc sql/field.h sql/field_conv.cc sql/ha_ndbcluster.cc sql/ha_partition.cc sql/handler.cc sql/handler.h sql/item.cc sql/item.h sql/item_cmpfunc.cc sql/item_func.cc sql/item_func.h sql/item_strfunc.cc sql/item_subselect.cc sql/item_sum.cc sql/item_timefunc.cc sql/item_timefunc.h sql/item_xmlfunc.cc sql/key.cc sql/lock.cc sql/lock.h sql/log.cc sql/log.h sql/log_event.cc sql/log_event.h sql/mdl.cc sql/mdl.h sql/my_decimal.h sql/mysqld.cc sql/mysqld.h sql/opt_range.cc sql/opt_range.h sql/protocol.cc sql/records.cc sql/rpl_handler.cc sql/rpl_record.cc sql/rpl_rli.cc sql/rpl_rli.h sql/slave.cc sql/sp.cc sql/sp.h sql/sp_head.cc sql/sp_head.h sql/sp_rcontext.h sql/sql_acl.cc sql/sql_admin.cc sql/sql_audit.h sql/sql_base.cc sql/sql_base.h sql/sql_class.cc sql/sql_class.h sql/sql_cursor.cc sql/sql_db.cc sql/sql_error.cc sql/sql_error.h sql/sql_handler.cc sql/sql_handler.h sql/sql_help.cc sql/sql_insert.cc sql/sql_lex.cc sql/sql_lex.h sql/sql_parse.cc sql/sql_partition.cc sql/sql_partition_admin.cc sql/sql_plugin.cc sql/sql_prepare.cc sql/sql_rename.cc sql/sql_select.cc sql/sql_show.cc sql/sql_show.h sql/sql_string.h sql/sql_table.cc sql/sql_table.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/sys_vars.cc sql/table.cc sql/table.h sql/transaction.cc storage/innobase/CMakeLists.txt storage/innobase/btr/btr0cur.c storage/innobase/buf/buf0buddy.c storage/innobase/buf/buf0buf.c storage/innobase/buf/buf0flu.c storage/innobase/buf/buf0lru.c storage/innobase/dict/dict0crea.c storage/innobase/dict/dict0dict.c storage/innobase/dict/dict0load.c storage/innobase/fil/fil0fil.c storage/innobase/fsp/fsp0fsp.c storage/innobase/handler/ha_innodb.cc storage/innobase/handler/ha_innodb.h storage/innobase/handler/handler0alter.cc storage/innobase/ibuf/ibuf0ibuf.c storage/innobase/include/btr0btr.h storage/innobase/include/btr0btr.ic storage/innobase/include/btr0cur.h storage/innobase/include/buf0buddy.h storage/innobase/include/buf0buddy.ic storage/innobase/include/buf0buf.h storage/innobase/include/buf0buf.ic storage/innobase/include/buf0flu.h storage/innobase/include/data0type.h storage/innobase/include/db0err.h storage/innobase/include/dict0dict.h storage/innobase/include/fil0fil.h storage/innobase/include/ibuf0ibuf.h storage/innobase/include/os0sync.h storage/innobase/include/rem0rec.h storage/innobase/include/row0ins.h storage/innobase/include/row0mysql.h storage/innobase/include/row0upd.h storage/innobase/include/srv0srv.h storage/innobase/include/sync0sync.h storage/innobase/include/trx0trx.h storage/innobase/include/trx0undo.h storage/innobase/include/univ.i storage/innobase/lock/lock0lock.c storage/innobase/log/log0log.c storage/innobase/os/os0file.c storage/innobase/os/os0sync.c storage/innobase/rem/rem0rec.c storage/innobase/row/row0ins.c storage/innobase/row/row0merge.c storage/innobase/row/row0mysql.c storage/innobase/row/row0sel.c storage/innobase/row/row0upd.c storage/innobase/srv/srv0srv.c storage/innobase/srv/srv0start.c storage/innobase/sync/sync0rw.c storage/innobase/sync/sync0sync.c storage/innobase/thr/thr0loc.c storage/innobase/trx/trx0i_s.c storage/innobase/trx/trx0trx.c storage/innobase/trx/trx0undo.c storage/innobase/ut/ut0ut.c storage/myisam/ft_nlq_search.c storage/myisam/ha_myisam.cc storage/myisam/myisamchk.c storage/myisammrg/myrg_open.c storage/ndb/src/mgmsrv/InitConfigFileParser.cpp storage/perfschema/pfs_global.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_lock.h storage/perfschema/table_events_waits.cc storage/perfschema/table_events_waits_summary.cc storage/perfschema/table_ews_global_by_event_name.cc storage/perfschema/table_file_instances.cc storage/perfschema/table_file_summary.cc storage/perfschema/table_performance_timers.cc storage/perfschema/table_setup_consumers.cc storage/perfschema/table_setup_instruments.cc storage/perfschema/table_setup_timers.cc storage/perfschema/table_sync_instances.cc storage/perfschema/table_threads.cc storage/perfschema/table_threads.h 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 strings/ctype-uca.c strings/ctype-ucs2.c strings/ctype-utf8.c support-files/CMakeLists.txt support-files/MySQL-shared-compat.spec.sh support-files/my-huge.cnf.sh support-files/my-innodb-heavy-4G.cnf.sh support-files/my-large.cnf.sh support-files/my-medium.cnf.sh support-files/my-small.cnf.sh support-files/mysql.spec.sh tests/mysql_client_test.c unittest/examples/skip-t.c unittest/examples/skip_all-t.c unittest/examples/todo-t.c unittest/mytap/t/basic-t.c unittest/mytap/tap.c unittest/mytap/tap.h Diff too large for email (87885 lines, the limit is 10000). No bundle (reason: revision is a merge).