List:Commits« Previous MessageNext Message »
From:Bjorn Munch Date:December 29 2010 4:58pm
Subject:bzr push into mysql-5.1-mtr branch (bjorn.munch:2961 to 2962)
View as plain text  
 2962 Bjorn Munch	2010-12-29 [merge]
      merge from 5.1 main

    removed:
      libmysqld/copyright
      mysql-test/include/reset_master_and_slave.inc
      mysql-test/include/rpl_diff_tables.inc
      mysql-test/suite/binlog/t/binlog_auto_increment_bug33029-master.opt
      mysql-test/suite/rpl/t/rpl000017-slave.sh
      mysql-test/suite/rpl/t/rpl_binlog_corruption-master.opt
      mysql-test/suite/rpl/t/rpl_flushlog_loop-master.sh
      mysql-test/suite/rpl/t/rpl_flushlog_loop-slave.sh
      mysql-test/suite/rpl/t/rpl_rotate_logs-slave.opt
      mysql-test/suite/rpl/t/rpl_rotate_logs-slave.sh
      mysql-test/suite/rpl/t/rpl_stm_000001.test
      storage/ndb/docs/doxygen/header.mgmapi.tex
      storage/ndb/docs/doxygen/header.ndbapi.tex
      storage/ndb/src/cw/cpcc-win32/vb6/
      storage/ndb/src/cw/cpcc-win32/vb6/Computer.cls
      storage/ndb/src/cw/cpcc-win32/vb6/Database.cls
      storage/ndb/src/cw/cpcc-win32/vb6/Icon 110.ico
      storage/ndb/src/cw/cpcc-win32/vb6/Icon 231.ico
      storage/ndb/src/cw/cpcc-win32/vb6/Icon 237.ico
      storage/ndb/src/cw/cpcc-win32/vb6/Icon 241.ico
      storage/ndb/src/cw/cpcc-win32/vb6/Icon 242.ico
      storage/ndb/src/cw/cpcc-win32/vb6/Icon 270.ico
      storage/ndb/src/cw/cpcc-win32/vb6/Icon 271.ico
      storage/ndb/src/cw/cpcc-win32/vb6/Icon 273.ico
      storage/ndb/src/cw/cpcc-win32/vb6/Icon 31.ico
      storage/ndb/src/cw/cpcc-win32/vb6/Icon 337.ico
      storage/ndb/src/cw/cpcc-win32/vb6/Icon 338.ico
      storage/ndb/src/cw/cpcc-win32/vb6/Icon 339.ico
      storage/ndb/src/cw/cpcc-win32/vb6/MSSCCPRJ.SCC
      storage/ndb/src/cw/cpcc-win32/vb6/Module1.bas
      storage/ndb/src/cw/cpcc-win32/vb6/NdbCPC.vbp
      storage/ndb/src/cw/cpcc-win32/vb6/NdbCPC.vbw
      storage/ndb/src/cw/cpcc-win32/vb6/Process.cls
      storage/ndb/src/cw/cpcc-win32/vb6/closed folder.ico
      storage/ndb/src/cw/cpcc-win32/vb6/computer.ico
      storage/ndb/src/cw/cpcc-win32/vb6/frmAbout.frm
      storage/ndb/src/cw/cpcc-win32/vb6/frmLogin.frm
      storage/ndb/src/cw/cpcc-win32/vb6/frmMain.frm
      storage/ndb/src/cw/cpcc-win32/vb6/frmNewComputer.frm
      storage/ndb/src/cw/cpcc-win32/vb6/frmNewComputer.frx
      storage/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase.frx
      storage/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase1.frm
      storage/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase2.frm
      storage/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase2.log
      storage/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase3.frm
      storage/ndb/src/cw/cpcc-win32/vb6/frmOptions.frm
      storage/ndb/src/cw/cpcc-win32/vb6/frmSplash.frx
      storage/ndb/src/cw/cpcc-win32/vb6/networking.ico
      storage/ndb/src/cw/cpcc-win32/vb6/open folder.ico
      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
    added:
      mysql-test/extra/rpl_tests/rpl_test_framework.inc
      mysql-test/include/assert.inc
      mysql-test/include/begin_include_file.inc
      mysql-test/include/end_include_file.inc
      mysql-test/include/file_does_not_exist.inc
      mysql-test/include/force_restart.inc
      mysql-test/include/force_restart_if_skipped.inc
      mysql-test/include/rpl_change_topology.inc
      mysql-test/include/rpl_connect.inc
      mysql-test/include/rpl_connection.inc
      mysql-test/include/rpl_for_each_slave.inc
      mysql-test/include/rpl_generate_sync_chain.inc
      mysql-test/include/rpl_reconnect.inc
      mysql-test/include/rpl_restart_server.inc
      mysql-test/include/rpl_start_server.inc
      mysql-test/include/rpl_start_slaves.inc
      mysql-test/include/rpl_stop_server.inc
      mysql-test/include/rpl_stop_slaves.inc
      mysql-test/include/save_master_pos.inc
      mysql-test/include/stop_slave_io.inc
      mysql-test/include/stop_slave_sql.inc
      mysql-test/include/sync_io_with_master.inc
      mysql-test/include/sync_slave_sql_with_io.inc
      mysql-test/include/wait_for_query_to_fail.inc
      mysql-test/include/write_var_to_file.inc
      mysql-test/suite/rpl/r/rpl_test_framework.result
      mysql-test/suite/rpl/t/rpl_test_framework.cnf
      mysql-test/suite/rpl/t/rpl_test_framework.test
    renamed:
      mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test => mysql-test/extra/rpl_tests/rpl_extra_col_master.test
      mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test => mysql-test/extra/rpl_tests/rpl_extra_col_slave.test
      mysql-test/extra/rpl_tests/rpl_stm_000001.test => mysql-test/suite/rpl/t/rpl_stm_000001.test
      mysql-test/include/circular_rpl_for_4_hosts_init.inc => mysql-test/include/rpl_init.inc
      mysql-test/include/circular_rpl_for_4_hosts_sync.inc => mysql-test/include/rpl_sync.inc
      mysql-test/include/diff_master_slave.inc => mysql-test/include/rpl_diff.inc
      mysql-test/include/master-slave-end.inc => mysql-test/include/rpl_end.inc
      mysql-test/include/master-slave-reset.inc => mysql-test/include/rpl_reset.inc
      mysql-test/suite/binlog/r/binlog_auto_increment_bug33029.result => mysql-test/suite/rpl/r/rpl_auto_increment_bug33029.result
      mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test => mysql-test/suite/rpl/t/rpl_auto_increment_bug33029.test
      mysql-test/suite/rpl/r/rpl000010.result => mysql-test/suite/rpl/r/rpl_000010.result
      mysql-test/suite/rpl/r/rpl000011.result => mysql-test/suite/rpl/r/rpl_000011.result
      mysql-test/suite/rpl/r/rpl000013.result => mysql-test/suite/rpl/r/rpl_000013.result
      mysql-test/suite/rpl/r/rpl000017.result => mysql-test/suite/rpl/r/rpl_000017.result
      mysql-test/suite/rpl/r/rpl_binlog_query_filter_rules.result => mysql-test/suite/binlog/r/binlog_query_filter_rules.result
      mysql-test/suite/rpl/r/rpl_drop_if_exists.result => mysql-test/suite/binlog/r/binlog_drop_if_exists.result
      mysql-test/suite/rpl/r/rpl_extraCol_innodb.result => mysql-test/suite/rpl/r/rpl_extra_col_slave_innodb.result
      mysql-test/suite/rpl/r/rpl_extraCol_myisam.result => mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.result
      mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result => mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result
      mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result => mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result
      mysql-test/suite/rpl/r/rpl_server_id.result => mysql-test/suite/binlog/r/binlog_server_id.result
      mysql-test/suite/rpl/r/rpl_sf.result => mysql-test/suite/binlog/r/binlog_sf.result
      mysql-test/suite/rpl/t/rpl000010-slave.opt => mysql-test/suite/rpl/t/rpl_000010-slave.opt
      mysql-test/suite/rpl/t/rpl000010.test => mysql-test/suite/rpl/t/rpl_000010.test
      mysql-test/suite/rpl/t/rpl000011.test => mysql-test/suite/rpl/t/rpl_000011.test
      mysql-test/suite/rpl/t/rpl000013.test => mysql-test/suite/rpl/t/rpl_000013.test
      mysql-test/suite/rpl/t/rpl000017-slave.opt => mysql-test/suite/rpl/t/rpl_000017-slave.opt
      mysql-test/suite/rpl/t/rpl000017.test => mysql-test/suite/rpl/t/rpl_000017.test
      mysql-test/suite/rpl/t/rpl_binlog_query_filter_rules-master.opt => mysql-test/suite/binlog/t/binlog_query_filter_rules-master.opt
      mysql-test/suite/rpl/t/rpl_binlog_query_filter_rules.test => mysql-test/suite/binlog/t/binlog_query_filter_rules.test
      mysql-test/suite/rpl/t/rpl_drop_if_exists.test => mysql-test/suite/binlog/t/binlog_drop_if_exists.test
      mysql-test/suite/rpl/t/rpl_extraCol_innodb.test => mysql-test/suite/rpl/t/rpl_extra_col_slave_innodb.test
      mysql-test/suite/rpl/t/rpl_extraCol_myisam.test => mysql-test/suite/rpl/t/rpl_extra_col_slave_myisam.test
      mysql-test/suite/rpl/t/rpl_extraColmaster_innodb.test => mysql-test/suite/rpl/t/rpl_extra_col_master_innodb.test
      mysql-test/suite/rpl/t/rpl_extraColmaster_myisam.test => mysql-test/suite/rpl/t/rpl_extra_col_master_myisam.test
      mysql-test/suite/rpl/t/rpl_server_id.test => mysql-test/suite/binlog/t/binlog_server_id.test
      mysql-test/suite/rpl/t/rpl_sf.test => mysql-test/suite/binlog/t/binlog_sf.test
    modified:
      BUILD/FINISH.sh
      BUILD/Makefile.am
      BUILD/SETUP.sh
      BUILD/autorun.sh
      BUILD/build_mccge.sh
      BUILD/check-cpu
      BUILD/cleanup
      BUILD/compile-alpha
      BUILD/compile-alpha-ccc
      BUILD/compile-alpha-cxx
      BUILD/compile-alpha-debug
      BUILD/compile-amd64-debug-max
      BUILD/compile-amd64-debug-max-no-ndb
      BUILD/compile-amd64-gcov
      BUILD/compile-amd64-gprof
      BUILD/compile-amd64-max
      BUILD/compile-amd64-max-sci
      BUILD/compile-amd64-valgrind-max
      BUILD/compile-darwin-mwcc
      BUILD/compile-dist
      BUILD/compile-hpux11-parisc2-aCC
      BUILD/compile-ia64-debug-max
      BUILD/compile-irix-mips64-mipspro
      BUILD/compile-ndb-autotest
      BUILD/compile-pentium
      BUILD/compile-pentium-cybozu
      BUILD/compile-pentium-debug
      BUILD/compile-pentium-debug-max
      BUILD/compile-pentium-debug-max-no-embedded
      BUILD/compile-pentium-debug-max-no-ndb
      BUILD/compile-pentium-debug-openssl
      BUILD/compile-pentium-debug-yassl
      BUILD/compile-pentium-gcov
      BUILD/compile-pentium-gprof
      BUILD/compile-pentium-icc
      BUILD/compile-pentium-icc-valgrind-max
      BUILD/compile-pentium-icc-yassl
      BUILD/compile-pentium-max
      BUILD/compile-pentium-myodbc
      BUILD/compile-pentium-mysqlfs-debug
      BUILD/compile-pentium-pgcc
      BUILD/compile-pentium-valgrind-max
      BUILD/compile-pentium-valgrind-max-no-ndb
      BUILD/compile-pentium64
      BUILD/compile-pentium64-debug
      BUILD/compile-pentium64-debug-max
      BUILD/compile-pentium64-gcov
      BUILD/compile-pentium64-gprof
      BUILD/compile-pentium64-max
      BUILD/compile-pentium64-max-sci
      BUILD/compile-pentium64-valgrind-max
      BUILD/compile-ppc
      BUILD/compile-ppc-debug
      BUILD/compile-ppc-debug-max
      BUILD/compile-ppc-debug-max-no-ndb
      BUILD/compile-ppc-max
      BUILD/compile-solaris-amd64
      BUILD/compile-solaris-amd64-debug
      BUILD/compile-solaris-amd64-forte
      BUILD/compile-solaris-amd64-forte-debug
      BUILD/compile-solaris-sparc
      BUILD/compile-solaris-sparc-debug
      BUILD/compile-solaris-sparc-forte
      BUILD/compile-solaris-sparc-purify
      Makefile.am
      client/completion_hash.h
      client/mysqltest.cc
      dbug/dbug_add_tags.pl
      extra/yassl/CMakeLists.txt
      extra/yassl/Makefile.am
      extra/yassl/examples/client/client.cpp
      extra/yassl/examples/echoclient/echoclient.cpp
      extra/yassl/examples/echoserver/echoserver.cpp
      extra/yassl/examples/server/server.cpp
      extra/yassl/include/lock.hpp
      extra/yassl/include/openssl/crypto.h
      extra/yassl/include/openssl/des.h
      extra/yassl/include/openssl/des_old.h
      extra/yassl/include/openssl/engine.h
      extra/yassl/include/openssl/err.h
      extra/yassl/include/openssl/evp.h
      extra/yassl/include/openssl/generate_prefix_files.pl
      extra/yassl/include/openssl/hmac.h
      extra/yassl/include/openssl/lhash.h
      extra/yassl/include/openssl/md4.h
      extra/yassl/include/openssl/md5.h
      extra/yassl/include/openssl/objects.h
      extra/yassl/include/openssl/opensslv.h
      extra/yassl/include/openssl/pem.h
      extra/yassl/include/openssl/pkcs12.h
      extra/yassl/include/openssl/prefix_crypto.h
      extra/yassl/include/openssl/prefix_ssl.h
      extra/yassl/include/openssl/rand.h
      extra/yassl/include/openssl/rsa.h
      extra/yassl/include/openssl/sha.h
      extra/yassl/include/openssl/x509.h
      extra/yassl/include/openssl/x509v3.h
      extra/yassl/src/Makefile.am
      extra/yassl/src/lock.cpp
      extra/yassl/src/make.bat
      extra/yassl/taocrypt/CMakeLists.txt
      extra/yassl/taocrypt/Makefile.am
      extra/yassl/taocrypt/benchmark/Makefile.am
      extra/yassl/taocrypt/benchmark/benchmark.cpp
      extra/yassl/taocrypt/benchmark/make.bat
      extra/yassl/taocrypt/src/Makefile.am
      extra/yassl/taocrypt/src/make.bat
      extra/yassl/taocrypt/test/Makefile.am
      extra/yassl/taocrypt/test/make.bat
      extra/yassl/taocrypt/test/memory.cpp
      extra/yassl/taocrypt/test/test.cpp
      extra/yassl/testsuite/Makefile.am
      extra/yassl/testsuite/make.bat
      extra/yassl/testsuite/test.hpp
      extra/yassl/testsuite/testsuite.cpp
      include/Makefile.am
      include/my_handler.h
      include/my_sys.h
      include/mysql_com.h
      libmysqld/examples/test-run
      man/Makefile.am
      mysql-test/Makefile.am
      mysql-test/extra/rpl_tests/rpl_EE_err.test
      mysql-test/extra/rpl_tests/rpl_auto_increment.test
      mysql-test/extra/rpl_tests/rpl_auto_increment_insert_view.test
      mysql-test/extra/rpl_tests/rpl_auto_increment_invoke_trigger.test
      mysql-test/extra/rpl_tests/rpl_autoinc_func_invokes_trigger.test
      mysql-test/extra/rpl_tests/rpl_charset.test
      mysql-test/extra/rpl_tests/rpl_commit_after_flush.test
      mysql-test/extra/rpl_tests/rpl_conflicts.test
      mysql-test/extra/rpl_tests/rpl_ddl.test
      mysql-test/extra/rpl_tests/rpl_deadlock.test
      mysql-test/extra/rpl_tests/rpl_failed_optimize.test
      mysql-test/extra/rpl_tests/rpl_flsh_tbls.test
      mysql-test/extra/rpl_tests/rpl_foreign_key.test
      mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test
      mysql-test/extra/rpl_tests/rpl_insert_id.test
      mysql-test/extra/rpl_tests/rpl_insert_id_pk.test
      mysql-test/extra/rpl_tests/rpl_loaddata.test
      mysql-test/extra/rpl_tests/rpl_log.test
      mysql-test/extra/rpl_tests/rpl_max_relay_size.test
      mysql-test/extra/rpl_tests/rpl_multi_query.test
      mysql-test/extra/rpl_tests/rpl_multi_update.test
      mysql-test/extra/rpl_tests/rpl_ndb_apply_status.test
      mysql-test/extra/rpl_tests/rpl_not_null.test
      mysql-test/extra/rpl_tests/rpl_record_compare.test
      mysql-test/extra/rpl_tests/rpl_reset_slave.test
      mysql-test/extra/rpl_tests/rpl_row_UUID.test
      mysql-test/extra/rpl_tests/rpl_row_basic.test
      mysql-test/extra/rpl_tests/rpl_row_delayed_ins.test
      mysql-test/extra/rpl_tests/rpl_row_sp002.test
      mysql-test/extra/rpl_tests/rpl_row_sp007.test
      mysql-test/extra/rpl_tests/rpl_set_null.test
      mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test
      mysql-test/extra/rpl_tests/rpl_stm_create_if_not_exists.test
      mysql-test/extra/rpl_tests/rpl_stop_slave.test
      mysql-test/extra/rpl_tests/rpl_sv_relay_space.test
      mysql-test/extra/rpl_tests/rpl_truncate.test
      mysql-test/extra/rpl_tests/rpl_truncate_helper.test
      mysql-test/include/analyze-sync_with_master.test
      mysql-test/include/check-testcase.test
      mysql-test/include/check_slave_is_running.inc
      mysql-test/include/check_slave_no_error.inc
      mysql-test/include/check_slave_param.inc
      mysql-test/include/cleanup_fake_relay_log.inc
      mysql-test/include/diff_tables.inc
      mysql-test/include/have_innodb.inc
      mysql-test/include/io_thd_fault_injection.inc
      mysql-test/include/kill_query_and_diff_master_slave.inc
      mysql-test/include/master-slave.inc
      mysql-test/include/mtr_check.sql
      mysql-test/include/mysqldump.inc
      mysql-test/include/ndb_master-slave.inc
      mysql-test/include/ndb_master-slave_2ch.inc
      mysql-test/include/ndb_not_readonly.inc
      mysql-test/include/report-features.test
      mysql-test/include/restart_mysqld.inc
      mysql-test/include/setup_fake_relay_log.inc
      mysql-test/include/show_rpl_debug_info.inc
      mysql-test/include/show_slave_status.inc
      mysql-test/include/start_slave.inc
      mysql-test/include/stop_slave.inc
      mysql-test/include/sync_slave_io_with_master.inc
      mysql-test/include/wait_for_slave_io_error.inc
      mysql-test/include/wait_for_slave_io_to_start.inc
      mysql-test/include/wait_for_slave_io_to_stop.inc
      mysql-test/include/wait_for_slave_param.inc
      mysql-test/include/wait_for_slave_sql_error.inc
      mysql-test/include/wait_for_slave_sql_error_and_skip.inc
      mysql-test/include/wait_for_slave_sql_to_start.inc
      mysql-test/include/wait_for_slave_sql_to_stop.inc
      mysql-test/include/wait_for_slave_to_start.inc
      mysql-test/include/wait_for_slave_to_stop.inc
      mysql-test/lib/mtr_cases.pm
      mysql-test/lib/mtr_process.pl
      mysql-test/mysql-stress-test.pl
      mysql-test/mysql-test-run.pl
      mysql-test/purify.supp
      mysql-test/r/func_group.result
      mysql-test/r/func_math.result
      mysql-test/r/init_file.result
      mysql-test/r/mysqlbinlog.result
      mysql-test/r/mysqldump_restore.result
      mysql-test/suite/binlog/r/binlog_old_versions.result
      mysql-test/suite/binlog/r/binlog_sql_mode.result
      mysql-test/suite/binlog/r/binlog_unsafe.result
      mysql-test/suite/binlog/t/binlog_old_versions.test
      mysql-test/suite/binlog/t/binlog_sql_mode.test
      mysql-test/suite/binlog/t/binlog_unsafe.test
      mysql-test/suite/bugs/t/rpl_bug12691.test
      mysql-test/suite/bugs/t/rpl_bug23533.test
      mysql-test/suite/bugs/t/rpl_bug31582.test
      mysql-test/suite/bugs/t/rpl_bug31583.test
      mysql-test/suite/bugs/t/rpl_bug33029.test
      mysql-test/suite/bugs/t/rpl_bug36391.test
      mysql-test/suite/bugs/t/rpl_bug37426.test
      mysql-test/suite/bugs/t/rpl_bug38205.test
      mysql-test/suite/manual/t/rpl_replication_delay.test
      mysql-test/suite/ndb_team/t/rpl_ndb_dd_advance.test
      mysql-test/suite/ndb_team/t/rpl_ndb_extraColMaster.test
      mysql-test/suite/ndb_team/t/rpl_ndb_mix_innodb.test
      mysql-test/suite/parts/r/rpl_partition.result
      mysql-test/suite/parts/t/rpl_partition.test
      mysql-test/suite/rpl/include/rpl_mixed_ddl.inc
      mysql-test/suite/rpl/include/rpl_mixed_dml.inc
      mysql-test/suite/rpl/r/rpl_EE_err.result
      mysql-test/suite/rpl/r/rpl_LD_INFILE.result
      mysql-test/suite/rpl/r/rpl_alter.result
      mysql-test/suite/rpl/r/rpl_alter_db.result
      mysql-test/suite/rpl/r/rpl_auto_increment.result
      mysql-test/suite/rpl/r/rpl_auto_increment_11932.result
      mysql-test/suite/rpl/r/rpl_auto_increment_update_failure.result
      mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result
      mysql-test/suite/rpl/r/rpl_binlog_corruption.result
      mysql-test/suite/rpl/r/rpl_binlog_errors.result
      mysql-test/suite/rpl/r/rpl_binlog_grant.result
      mysql-test/suite/rpl/r/rpl_binlog_max_cache_size.result
      mysql-test/suite/rpl/r/rpl_bit.result
      mysql-test/suite/rpl/r/rpl_bit_npk.result
      mysql-test/suite/rpl/r/rpl_blackhole.result
      mysql-test/suite/rpl/r/rpl_bug26395.result
      mysql-test/suite/rpl/r/rpl_bug31076.result
      mysql-test/suite/rpl/r/rpl_bug33931.result
      mysql-test/suite/rpl/r/rpl_bug38694.result
      mysql-test/suite/rpl/r/rpl_change_master.result
      mysql-test/suite/rpl/r/rpl_charset.result
      mysql-test/suite/rpl/r/rpl_charset_sjis.result
      mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result
      mysql-test/suite/rpl/r/rpl_colSize.result
      mysql-test/suite/rpl/r/rpl_commit_after_flush.result
      mysql-test/suite/rpl/r/rpl_concurrency_error.result
      mysql-test/suite/rpl/r/rpl_conditional_comments.result
      mysql-test/suite/rpl/r/rpl_create_database.result
      mysql-test/suite/rpl/r/rpl_create_if_not_exists.result
      mysql-test/suite/rpl/r/rpl_create_tmp_table_if_not_exists.result
      mysql-test/suite/rpl/r/rpl_cross_version.result
      mysql-test/suite/rpl/r/rpl_current_user.result
      mysql-test/suite/rpl/r/rpl_deadlock_innodb.result
      mysql-test/suite/rpl/r/rpl_delete_no_where.result
      mysql-test/suite/rpl/r/rpl_do_grant.result
      mysql-test/suite/rpl/r/rpl_drop.result
      mysql-test/suite/rpl/r/rpl_drop_db.result
      mysql-test/suite/rpl/r/rpl_drop_temp.result
      mysql-test/suite/rpl/r/rpl_drop_view.result
      mysql-test/suite/rpl/r/rpl_dual_pos_advance.result
      mysql-test/suite/rpl/r/rpl_empty_master_crash.result
      mysql-test/suite/rpl/r/rpl_err_ignoredtable.result
      mysql-test/suite/rpl/r/rpl_events.result
      mysql-test/suite/rpl/r/rpl_failed_optimize.result
      mysql-test/suite/rpl/r/rpl_filter_tables_not_exist.result
      mysql-test/suite/rpl/r/rpl_flushlog_loop.result
      mysql-test/suite/rpl/r/rpl_foreign_key_innodb.result
      mysql-test/suite/rpl/r/rpl_found_rows.result
      mysql-test/suite/rpl/r/rpl_free_items.result
      mysql-test/suite/rpl/r/rpl_geometry.result
      mysql-test/suite/rpl/r/rpl_get_lock.result
      mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result
      mysql-test/suite/rpl/r/rpl_grant.result
      mysql-test/suite/rpl/r/rpl_idempotency.result
      mysql-test/suite/rpl/r/rpl_ignore_grant.result
      mysql-test/suite/rpl/r/rpl_ignore_revoke.result
      mysql-test/suite/rpl/r/rpl_ignore_table.result
      mysql-test/suite/rpl/r/rpl_ignore_table_update.result
      mysql-test/suite/rpl/r/rpl_incident.result
      mysql-test/suite/rpl/r/rpl_init_slave.result
      mysql-test/suite/rpl/r/rpl_init_slave_errors.result
      mysql-test/suite/rpl/r/rpl_innodb.result
      mysql-test/suite/rpl/r/rpl_innodb_bug28430.result
      mysql-test/suite/rpl/r/rpl_innodb_bug30888.result
      mysql-test/suite/rpl/r/rpl_innodb_mixed_ddl.result
      mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result
      mysql-test/suite/rpl/r/rpl_insert.result
      mysql-test/suite/rpl/r/rpl_insert_id.result
      mysql-test/suite/rpl/r/rpl_insert_id_pk.result
      mysql-test/suite/rpl/r/rpl_insert_ignore.result
      mysql-test/suite/rpl/r/rpl_insert_select.result
      mysql-test/suite/rpl/r/rpl_invoked_features.result
      mysql-test/suite/rpl/r/rpl_killed_ddl.result
      mysql-test/suite/rpl/r/rpl_known_bugs_detection.result
      mysql-test/suite/rpl/r/rpl_load_from_master.result
      mysql-test/suite/rpl/r/rpl_load_table_from_master.result
      mysql-test/suite/rpl/r/rpl_loaddata.result
      mysql-test/suite/rpl/r/rpl_loaddata_charset.result
      mysql-test/suite/rpl/r/rpl_loaddata_concurrent.result
      mysql-test/suite/rpl/r/rpl_loaddata_fatal.result
      mysql-test/suite/rpl/r/rpl_loaddata_m.result
      mysql-test/suite/rpl/r/rpl_loaddata_map.result
      mysql-test/suite/rpl/r/rpl_loaddata_s.result
      mysql-test/suite/rpl/r/rpl_loaddata_simple.result
      mysql-test/suite/rpl/r/rpl_loaddata_symlink.result
      mysql-test/suite/rpl/r/rpl_loaddatalocal.result
      mysql-test/suite/rpl/r/rpl_loadfile.result
      mysql-test/suite/rpl/r/rpl_locale.result
      mysql-test/suite/rpl/r/rpl_log_pos.result
      mysql-test/suite/rpl/r/rpl_manual_change_index_file.result
      mysql-test/suite/rpl/r/rpl_many_optimize.result
      mysql-test/suite/rpl/r/rpl_master_pos_wait.result
      mysql-test/suite/rpl/r/rpl_misc_functions.result
      mysql-test/suite/rpl/r/rpl_mixed_bit_pk.result
      mysql-test/suite/rpl/r/rpl_mixed_ddl_dml.result
      mysql-test/suite/rpl/r/rpl_multi_delete.result
      mysql-test/suite/rpl/r/rpl_multi_delete2.result
      mysql-test/suite/rpl/r/rpl_multi_engine.result
      mysql-test/suite/rpl/r/rpl_multi_update.result
      mysql-test/suite/rpl/r/rpl_multi_update2.result
      mysql-test/suite/rpl/r/rpl_multi_update3.result
      mysql-test/suite/rpl/r/rpl_multi_update4.result
      mysql-test/suite/rpl/r/rpl_mysql_upgrade.result
      mysql-test/suite/rpl/r/rpl_name_const.result
      mysql-test/suite/rpl/r/rpl_nondeterministic_functions.result
      mysql-test/suite/rpl/r/rpl_not_null_innodb.result
      mysql-test/suite/rpl/r/rpl_not_null_myisam.result
      mysql-test/suite/rpl/r/rpl_optimize.result
      mysql-test/suite/rpl/r/rpl_packet.result
      mysql-test/suite/rpl/r/rpl_plugin_load.result
      mysql-test/suite/rpl/r/rpl_ps.result
      mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result
      mysql-test/suite/rpl/r/rpl_read_only.result
      mysql-test/suite/rpl/r/rpl_relay_space_innodb.result
      mysql-test/suite/rpl/r/rpl_relay_space_myisam.result
      mysql-test/suite/rpl/r/rpl_relayrotate.result
      mysql-test/suite/rpl/r/rpl_relayspace.result
      mysql-test/suite/rpl/r/rpl_replicate_do.result
      mysql-test/suite/rpl/r/rpl_replicate_ignore_db.result
      mysql-test/suite/rpl/r/rpl_report.result
      mysql-test/suite/rpl/r/rpl_rewrt_db.result
      mysql-test/suite/rpl/r/rpl_rotate_logs.result
      mysql-test/suite/rpl/r/rpl_row_001.result
      mysql-test/suite/rpl/r/rpl_row_4_bytes.result
      mysql-test/suite/rpl/r/rpl_row_NOW.result
      mysql-test/suite/rpl/r/rpl_row_USER.result
      mysql-test/suite/rpl/r/rpl_row_UUID.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_basic_8partition.result
      mysql-test/suite/rpl/r/rpl_row_blob_innodb.result
      mysql-test/suite/rpl/r/rpl_row_blob_myisam.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_delayed_ins.result
      mysql-test/suite/rpl/r/rpl_row_drop.result
      mysql-test/suite/rpl/r/rpl_row_find_row.result
      mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result
      mysql-test/suite/rpl/r/rpl_row_func001.result
      mysql-test/suite/rpl/r/rpl_row_func002.result
      mysql-test/suite/rpl/r/rpl_row_func003.result
      mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result
      mysql-test/suite/rpl/r/rpl_row_insert_delayed.result
      mysql-test/suite/rpl/r/rpl_row_log.result
      mysql-test/suite/rpl/r/rpl_row_log_innodb.result
      mysql-test/suite/rpl/r/rpl_row_max_relay_size.result
      mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result
      mysql-test/suite/rpl/r/rpl_row_rec_comp_innodb.result
      mysql-test/suite/rpl/r/rpl_row_rec_comp_myisam.result
      mysql-test/suite/rpl/r/rpl_row_reset_slave.result
      mysql-test/suite/rpl/r/rpl_row_sp001.result
      mysql-test/suite/rpl/r/rpl_row_sp002_innodb.result
      mysql-test/suite/rpl/r/rpl_row_sp003.result
      mysql-test/suite/rpl/r/rpl_row_sp005.result
      mysql-test/suite/rpl/r/rpl_row_sp006_InnoDB.result
      mysql-test/suite/rpl/r/rpl_row_sp007_innodb.result
      mysql-test/suite/rpl/r/rpl_row_sp008.result
      mysql-test/suite/rpl/r/rpl_row_sp009.result
      mysql-test/suite/rpl/r/rpl_row_sp010.result
      mysql-test/suite/rpl/r/rpl_row_sp011.result
      mysql-test/suite/rpl/r/rpl_row_sp012.result
      mysql-test/suite/rpl/r/rpl_row_stop_middle_update.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_row_tbl_metadata.result
      mysql-test/suite/rpl/r/rpl_row_trig001.result
      mysql-test/suite/rpl/r/rpl_row_trig002.result
      mysql-test/suite/rpl/r/rpl_row_trig003.result
      mysql-test/suite/rpl/r/rpl_row_trig004.result
      mysql-test/suite/rpl/r/rpl_row_trunc_temp.result
      mysql-test/suite/rpl/r/rpl_row_unsafe_funcs.result
      mysql-test/suite/rpl/r/rpl_row_until.result
      mysql-test/suite/rpl/r/rpl_row_view01.result
      mysql-test/suite/rpl/r/rpl_row_wide_table.result
      mysql-test/suite/rpl/r/rpl_server_id1.result
      mysql-test/suite/rpl/r/rpl_server_id2.result
      mysql-test/suite/rpl/r/rpl_session_var.result
      mysql-test/suite/rpl/r/rpl_set_charset.result
      mysql-test/suite/rpl/r/rpl_set_null_innodb.result
      mysql-test/suite/rpl/r/rpl_set_null_myisam.result
      mysql-test/suite/rpl/r/rpl_show_slave_running.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_in.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_skip.result
      mysql-test/suite/rpl/r/rpl_slave_status.result
      mysql-test/suite/rpl/r/rpl_slow_query_log.result
      mysql-test/suite/rpl/r/rpl_sp.result
      mysql-test/suite/rpl/r/rpl_sp004.result
      mysql-test/suite/rpl/r/rpl_sp_effects.result
      mysql-test/suite/rpl/r/rpl_sporadic_master.result
      mysql-test/suite/rpl/r/rpl_ssl.result
      mysql-test/suite/rpl/r/rpl_ssl1.result
      mysql-test/suite/rpl/r/rpl_start_stop_slave.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_auto_increment_bug33029.result
      mysql-test/suite/rpl/r/rpl_stm_binlog_direct.result
      mysql-test/suite/rpl/r/rpl_stm_conflicts.result
      mysql-test/suite/rpl/r/rpl_stm_create_if_not_exists.result
      mysql-test/suite/rpl/r/rpl_stm_flsh_tbls.result
      mysql-test/suite/rpl/r/rpl_stm_insert_delayed.result
      mysql-test/suite/rpl/r/rpl_stm_loadfile.result
      mysql-test/suite/rpl/r/rpl_stm_log.result
      mysql-test/suite/rpl/r/rpl_stm_max_relay_size.result
      mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result
      mysql-test/suite/rpl/r/rpl_stm_multi_query.result
      mysql-test/suite/rpl/r/rpl_stm_no_op.result
      mysql-test/suite/rpl/r/rpl_stm_reset_slave.result
      mysql-test/suite/rpl/r/rpl_stm_sql_mode.result
      mysql-test/suite/rpl/r/rpl_stm_until.result
      mysql-test/suite/rpl/r/rpl_stop_slave.result
      mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result
      mysql-test/suite/rpl/r/rpl_temp_table.result
      mysql-test/suite/rpl/r/rpl_temp_table_mix_row.result
      mysql-test/suite/rpl/r/rpl_temporary.result
      mysql-test/suite/rpl/r/rpl_temporary_errors.result
      mysql-test/suite/rpl/r/rpl_timezone.result
      mysql-test/suite/rpl/r/rpl_tmp_table_and_DDL.result
      mysql-test/suite/rpl/r/rpl_trigger.result
      mysql-test/suite/rpl/r/rpl_trunc_temp.result
      mysql-test/suite/rpl/r/rpl_truncate_2myisam.result
      mysql-test/suite/rpl/r/rpl_truncate_3innodb.result
      mysql-test/suite/rpl/r/rpl_typeconv_innodb.result
      mysql-test/suite/rpl/r/rpl_udf.result
      mysql-test/suite/rpl/r/rpl_user.result
      mysql-test/suite/rpl/r/rpl_user_variables.result
      mysql-test/suite/rpl/r/rpl_variables.result
      mysql-test/suite/rpl/r/rpl_variables_stm.result
      mysql-test/suite/rpl/r/rpl_view.result
      mysql-test/suite/rpl/t/rpl_EE_err.test
      mysql-test/suite/rpl/t/rpl_LD_INFILE.test
      mysql-test/suite/rpl/t/rpl_alter.test
      mysql-test/suite/rpl/t/rpl_alter_db.test
      mysql-test/suite/rpl/t/rpl_auto_increment.test
      mysql-test/suite/rpl/t/rpl_auto_increment_11932.test
      mysql-test/suite/rpl/t/rpl_auto_increment_update_failure.test
      mysql-test/suite/rpl/t/rpl_begin_commit_rollback.test
      mysql-test/suite/rpl/t/rpl_binlog_corruption.test
      mysql-test/suite/rpl/t/rpl_binlog_errors.test
      mysql-test/suite/rpl/t/rpl_binlog_grant.test
      mysql-test/suite/rpl/t/rpl_binlog_max_cache_size.test
      mysql-test/suite/rpl/t/rpl_bit.test
      mysql-test/suite/rpl/t/rpl_bit_npk.test
      mysql-test/suite/rpl/t/rpl_blackhole.test
      mysql-test/suite/rpl/t/rpl_bug26395.test
      mysql-test/suite/rpl/t/rpl_bug31076.test
      mysql-test/suite/rpl/t/rpl_bug33931.test
      mysql-test/suite/rpl/t/rpl_bug38694.test
      mysql-test/suite/rpl/t/rpl_change_master.test
      mysql-test/suite/rpl/t/rpl_charset.test
      mysql-test/suite/rpl/t/rpl_charset_sjis.test
      mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.cnf
      mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test
      mysql-test/suite/rpl/t/rpl_colSize.test
      mysql-test/suite/rpl/t/rpl_commit_after_flush.test
      mysql-test/suite/rpl/t/rpl_concurrency_error.test
      mysql-test/suite/rpl/t/rpl_conditional_comments.test
      mysql-test/suite/rpl/t/rpl_create_database.test
      mysql-test/suite/rpl/t/rpl_create_if_not_exists.test
      mysql-test/suite/rpl/t/rpl_create_tmp_table_if_not_exists.test
      mysql-test/suite/rpl/t/rpl_critical_errors.test
      mysql-test/suite/rpl/t/rpl_cross_version.test
      mysql-test/suite/rpl/t/rpl_current_user.cnf
      mysql-test/suite/rpl/t/rpl_current_user.test
      mysql-test/suite/rpl/t/rpl_ddl.test
      mysql-test/suite/rpl/t/rpl_deadlock_innodb.test
      mysql-test/suite/rpl/t/rpl_delete_no_where.test
      mysql-test/suite/rpl/t/rpl_do_grant.test
      mysql-test/suite/rpl/t/rpl_drop.test
      mysql-test/suite/rpl/t/rpl_drop_db.test
      mysql-test/suite/rpl/t/rpl_drop_temp.test
      mysql-test/suite/rpl/t/rpl_drop_view.test
      mysql-test/suite/rpl/t/rpl_dual_pos_advance.test
      mysql-test/suite/rpl/t/rpl_empty_master_crash.test
      mysql-test/suite/rpl/t/rpl_err_ignoredtable.test
      mysql-test/suite/rpl/t/rpl_events.test
      mysql-test/suite/rpl/t/rpl_failed_optimize.test
      mysql-test/suite/rpl/t/rpl_filter_tables_not_exist.test
      mysql-test/suite/rpl/t/rpl_flushlog_loop-master.opt
      mysql-test/suite/rpl/t/rpl_flushlog_loop-slave.opt
      mysql-test/suite/rpl/t/rpl_flushlog_loop.test
      mysql-test/suite/rpl/t/rpl_foreign_key_innodb.test
      mysql-test/suite/rpl/t/rpl_found_rows.test
      mysql-test/suite/rpl/t/rpl_free_items.test
      mysql-test/suite/rpl/t/rpl_geometry.test
      mysql-test/suite/rpl/t/rpl_get_lock.test
      mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test
      mysql-test/suite/rpl/t/rpl_grant.test
      mysql-test/suite/rpl/t/rpl_idempotency.test
      mysql-test/suite/rpl/t/rpl_ignore_grant.test
      mysql-test/suite/rpl/t/rpl_ignore_revoke.test
      mysql-test/suite/rpl/t/rpl_ignore_table.test
      mysql-test/suite/rpl/t/rpl_ignore_table_update.test
      mysql-test/suite/rpl/t/rpl_incident.test
      mysql-test/suite/rpl/t/rpl_init_slave.test
      mysql-test/suite/rpl/t/rpl_init_slave_errors.test
      mysql-test/suite/rpl/t/rpl_innodb.test
      mysql-test/suite/rpl/t/rpl_innodb_bug28430.test
      mysql-test/suite/rpl/t/rpl_innodb_bug30888.test
      mysql-test/suite/rpl/t/rpl_innodb_mixed_ddl.test
      mysql-test/suite/rpl/t/rpl_innodb_mixed_dml.test
      mysql-test/suite/rpl/t/rpl_insert.test
      mysql-test/suite/rpl/t/rpl_insert_id.test
      mysql-test/suite/rpl/t/rpl_insert_id_pk.test
      mysql-test/suite/rpl/t/rpl_insert_ignore.test
      mysql-test/suite/rpl/t/rpl_insert_select.test
      mysql-test/suite/rpl/t/rpl_invoked_features.test
      mysql-test/suite/rpl/t/rpl_killed_ddl.test
      mysql-test/suite/rpl/t/rpl_known_bugs_detection.test
      mysql-test/suite/rpl/t/rpl_load_from_master.test
      mysql-test/suite/rpl/t/rpl_load_table_from_master.test
      mysql-test/suite/rpl/t/rpl_loaddata.test
      mysql-test/suite/rpl/t/rpl_loaddata_charset.test
      mysql-test/suite/rpl/t/rpl_loaddata_fatal.test
      mysql-test/suite/rpl/t/rpl_loaddata_m.test
      mysql-test/suite/rpl/t/rpl_loaddata_map.test
      mysql-test/suite/rpl/t/rpl_loaddata_s.test
      mysql-test/suite/rpl/t/rpl_loaddata_simple.test
      mysql-test/suite/rpl/t/rpl_loaddata_symlink.test
      mysql-test/suite/rpl/t/rpl_loaddatalocal.test
      mysql-test/suite/rpl/t/rpl_loadfile.test
      mysql-test/suite/rpl/t/rpl_locale.test
      mysql-test/suite/rpl/t/rpl_log_pos.test
      mysql-test/suite/rpl/t/rpl_manual_change_index_file.test
      mysql-test/suite/rpl/t/rpl_many_optimize.test
      mysql-test/suite/rpl/t/rpl_master_pos_wait.test
      mysql-test/suite/rpl/t/rpl_misc_functions.test
      mysql-test/suite/rpl/t/rpl_mixed_bit_pk.test
      mysql-test/suite/rpl/t/rpl_mixed_ddl_dml.test
      mysql-test/suite/rpl/t/rpl_multi_delete.test
      mysql-test/suite/rpl/t/rpl_multi_delete2.test
      mysql-test/suite/rpl/t/rpl_multi_engine.test
      mysql-test/suite/rpl/t/rpl_multi_update.test
      mysql-test/suite/rpl/t/rpl_multi_update2.test
      mysql-test/suite/rpl/t/rpl_multi_update3.test
      mysql-test/suite/rpl/t/rpl_multi_update4.test
      mysql-test/suite/rpl/t/rpl_mysql_upgrade.test
      mysql-test/suite/rpl/t/rpl_name_const.test
      mysql-test/suite/rpl/t/rpl_nondeterministic_functions.test
      mysql-test/suite/rpl/t/rpl_not_null_innodb.test
      mysql-test/suite/rpl/t/rpl_not_null_myisam.test
      mysql-test/suite/rpl/t/rpl_optimize.test
      mysql-test/suite/rpl/t/rpl_packet.test
      mysql-test/suite/rpl/t/rpl_plugin_load.test
      mysql-test/suite/rpl/t/rpl_ps.test
      mysql-test/suite/rpl/t/rpl_rbr_to_sbr.test
      mysql-test/suite/rpl/t/rpl_read_only.test
      mysql-test/suite/rpl/t/rpl_relay_space_innodb.test
      mysql-test/suite/rpl/t/rpl_relay_space_myisam.test
      mysql-test/suite/rpl/t/rpl_relayrotate.test
      mysql-test/suite/rpl/t/rpl_relayspace.test
      mysql-test/suite/rpl/t/rpl_replicate_do.test
      mysql-test/suite/rpl/t/rpl_replicate_ignore_db.test
      mysql-test/suite/rpl/t/rpl_report.test
      mysql-test/suite/rpl/t/rpl_rewrt_db.test
      mysql-test/suite/rpl/t/rpl_rotate_logs.test
      mysql-test/suite/rpl/t/rpl_row_001.test
      mysql-test/suite/rpl/t/rpl_row_4_bytes.test
      mysql-test/suite/rpl/t/rpl_row_NOW.test
      mysql-test/suite/rpl/t/rpl_row_USER.test
      mysql-test/suite/rpl/t/rpl_row_UUID.test
      mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test
      mysql-test/suite/rpl/t/rpl_row_basic_2myisam.test
      mysql-test/suite/rpl/t/rpl_row_basic_3innodb.test
      mysql-test/suite/rpl/t/rpl_row_basic_8partition.test
      mysql-test/suite/rpl/t/rpl_row_blob_innodb.test
      mysql-test/suite/rpl/t/rpl_row_blob_myisam.test
      mysql-test/suite/rpl/t/rpl_row_colSize.test
      mysql-test/suite/rpl/t/rpl_row_conflicts.test
      mysql-test/suite/rpl/t/rpl_row_create_table.test
      mysql-test/suite/rpl/t/rpl_row_delayed_ins.test
      mysql-test/suite/rpl/t/rpl_row_drop.test
      mysql-test/suite/rpl/t/rpl_row_find_row.test
      mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test
      mysql-test/suite/rpl/t/rpl_row_func001.test
      mysql-test/suite/rpl/t/rpl_row_func002.test
      mysql-test/suite/rpl/t/rpl_row_func003.test
      mysql-test/suite/rpl/t/rpl_row_inexist_tbl.test
      mysql-test/suite/rpl/t/rpl_row_insert_delayed.test
      mysql-test/suite/rpl/t/rpl_row_log.test
      mysql-test/suite/rpl/t/rpl_row_log_innodb.test
      mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test
      mysql-test/suite/rpl/t/rpl_row_rec_comp_innodb.test
      mysql-test/suite/rpl/t/rpl_row_rec_comp_myisam.test
      mysql-test/suite/rpl/t/rpl_row_sp001.test
      mysql-test/suite/rpl/t/rpl_row_sp002_innodb.test
      mysql-test/suite/rpl/t/rpl_row_sp003.test
      mysql-test/suite/rpl/t/rpl_row_sp005.test
      mysql-test/suite/rpl/t/rpl_row_sp006_InnoDB.test
      mysql-test/suite/rpl/t/rpl_row_sp007_innodb.test
      mysql-test/suite/rpl/t/rpl_row_sp008.test
      mysql-test/suite/rpl/t/rpl_row_sp009.test
      mysql-test/suite/rpl/t/rpl_row_sp010.test
      mysql-test/suite/rpl/t/rpl_row_sp011.test
      mysql-test/suite/rpl/t/rpl_row_sp012.test
      mysql-test/suite/rpl/t/rpl_row_stop_middle_update.test
      mysql-test/suite/rpl/t/rpl_row_tabledefs_2myisam.test
      mysql-test/suite/rpl/t/rpl_row_tabledefs_3innodb.test
      mysql-test/suite/rpl/t/rpl_row_tbl_metadata.test
      mysql-test/suite/rpl/t/rpl_row_trig001.test
      mysql-test/suite/rpl/t/rpl_row_trig002.test
      mysql-test/suite/rpl/t/rpl_row_trig003.test
      mysql-test/suite/rpl/t/rpl_row_trig004.test
      mysql-test/suite/rpl/t/rpl_row_trunc_temp.test
      mysql-test/suite/rpl/t/rpl_row_unsafe_funcs.test
      mysql-test/suite/rpl/t/rpl_row_until.test
      mysql-test/suite/rpl/t/rpl_row_view01.test
      mysql-test/suite/rpl/t/rpl_row_wide_table.test
      mysql-test/suite/rpl/t/rpl_server_id1.test
      mysql-test/suite/rpl/t/rpl_server_id2.test
      mysql-test/suite/rpl/t/rpl_session_var.test
      mysql-test/suite/rpl/t/rpl_set_charset.test
      mysql-test/suite/rpl/t/rpl_set_null_innodb.test
      mysql-test/suite/rpl/t/rpl_set_null_myisam.test
      mysql-test/suite/rpl/t/rpl_show_slave_running.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_in.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_skip.test
      mysql-test/suite/rpl/t/rpl_slave_status.test
      mysql-test/suite/rpl/t/rpl_slow_query_log.test
      mysql-test/suite/rpl/t/rpl_sp.test
      mysql-test/suite/rpl/t/rpl_sp004.test
      mysql-test/suite/rpl/t/rpl_sp_effects.test
      mysql-test/suite/rpl/t/rpl_sporadic_master.test
      mysql-test/suite/rpl/t/rpl_ssl.test
      mysql-test/suite/rpl/t/rpl_ssl1.test
      mysql-test/suite/rpl/t/rpl_start_stop_slave.test
      mysql-test/suite/rpl/t/rpl_stm_auto_increment_bug33029.test
      mysql-test/suite/rpl/t/rpl_stm_binlog_direct.test
      mysql-test/suite/rpl/t/rpl_stm_conflicts.test
      mysql-test/suite/rpl/t/rpl_stm_create_if_not_exists.test
      mysql-test/suite/rpl/t/rpl_stm_flsh_tbls.test
      mysql-test/suite/rpl/t/rpl_stm_insert_delayed.test
      mysql-test/suite/rpl/t/rpl_stm_loadfile.test
      mysql-test/suite/rpl/t/rpl_stm_log.test
      mysql-test/suite/rpl/t/rpl_stm_max_relay_size.test
      mysql-test/suite/rpl/t/rpl_stm_mixing_engines.test
      mysql-test/suite/rpl/t/rpl_stm_multi_query.test
      mysql-test/suite/rpl/t/rpl_stm_no_op.test
      mysql-test/suite/rpl/t/rpl_stm_sql_mode.test
      mysql-test/suite/rpl/t/rpl_stm_until.test
      mysql-test/suite/rpl/t/rpl_stop_slave.test
      mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test
      mysql-test/suite/rpl/t/rpl_temp_table.test
      mysql-test/suite/rpl/t/rpl_temp_table_mix_row.test
      mysql-test/suite/rpl/t/rpl_temporary.test
      mysql-test/suite/rpl/t/rpl_temporary_errors.test
      mysql-test/suite/rpl/t/rpl_timezone.test
      mysql-test/suite/rpl/t/rpl_tmp_table_and_DDL.test
      mysql-test/suite/rpl/t/rpl_trigger.test
      mysql-test/suite/rpl/t/rpl_trunc_temp.test
      mysql-test/suite/rpl/t/rpl_truncate_2myisam.test
      mysql-test/suite/rpl/t/rpl_truncate_3innodb.test
      mysql-test/suite/rpl/t/rpl_typeconv_innodb.test
      mysql-test/suite/rpl/t/rpl_udf.test
      mysql-test/suite/rpl/t/rpl_user.test
      mysql-test/suite/rpl/t/rpl_user_variables.test
      mysql-test/suite/rpl/t/rpl_variables.test
      mysql-test/suite/rpl/t/rpl_variables_stm.test
      mysql-test/suite/rpl/t/rpl_view.test
      mysql-test/suite/rpl_ndb/r/rpl_ndb_2other.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_UUID.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_apply_status.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_auto_inc.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_basic.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_blob.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_blob2.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_2ch.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_commit_afterflush.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_ctype_ucs2_def.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_basic.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_partitions.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_ddl.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_delete_nowhere.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_do_db.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_do_table.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_func003.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_idempotent.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_innodb2ndb.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_innodb_trans.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_insert_ignore.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_mixed_engines_transactions.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_mixed_tables.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_multi.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_multi_update2.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_multi_update3.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_myisam2ndb.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_rep_ignore.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_row_001.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_set_null.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_sp003.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_sp006.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_sync.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_trig004.result
      mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result
      mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb.result
      mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_2ndb.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_2other.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_UUID.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_auto_inc.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_bank.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_basic.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_blob.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_blob2.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.cnf
      mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_commit_afterflush.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_ctype_ucs2_def.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_basic.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_ddl.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_delete_nowhere.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_do_db.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_do_table.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_extraCol.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_func003.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_idempotent.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb_trans.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_insert_ignore.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_load.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_log.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_engines_transactions.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_tables.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_multi.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update2.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update3.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_relayrotate.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_rep_ignore.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_row_001.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_set_null.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_sp003.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_sp006.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_sync.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_trig004.test
      mysql-test/suite/rpl_ndb/t/rpl_ndbapi_multi.test
      mysql-test/suite/rpl_ndb/t/rpl_row_basic_7ndb.test
      mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb.test
      mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2.test
      mysql-test/suite/sys_vars/t/rpl_init_slave_func.test
      mysql-test/t/func_group.test
      mysql-test/t/func_math.test
      mysql-test/t/init_file.test
      mysql-test/t/mysqlbinlog.test
      mysql-test/valgrind.supp
      mysys/mf_pack.c
      scripts/fill_help_tables.sql
      scripts/make_binary_distribution.sh
      scripts/make_win_bin_dist
      scripts/mysql_fix_extensions.sh
      scripts/mysql_setpermission.sh
      scripts/mysql_system_tables.sql
      scripts/mysql_system_tables_data.sql
      scripts/mysql_system_tables_fix.sql
      scripts/mysql_test_data_timezone.sql
      scripts/mysqlaccess.sh
      scripts/mysqld_multi.sh
      scripts/mysqldumpslow.sh
      scripts/mysqlhotcopy.sh
      server-tools/instance-manager/options.cc
      sql/field.cc
      sql/gen_lex_hash.cc
      sql/item.cc
      sql/item.h
      sql/item_cmpfunc.cc
      sql/item_cmpfunc.h
      sql/item_func.cc
      sql/item_func.h
      sql/item_subselect.cc
      sql/item_sum.cc
      sql/item_sum.h
      sql/log_event.cc
      sql/log_event.h
      sql/message.h
      sql/mysqld.cc
      sql/net_serv.cc
      sql/opt_range.cc
      sql/rpl_record.cc
      sql/rpl_record.h
      sql/set_var.cc
      sql/set_var.h
      sql/share/charsets/languages.html
      sql/sql_base.cc
      sql/sql_class.h
      sql/sql_parse.cc
      sql/sql_prepare.cc
      sql/sql_select.cc
      sql/sql_select.h
      sql/sql_show.cc
      sql/sql_update.cc
      sql/table.h
      storage/heap/hp_delete.c
      storage/myisam/ftbench/Ecompare.pl
      storage/myisam/ftbench/Ecreate.pl
      storage/myisam/ftbench/Ereport.pl
      storage/myisam/ftbench/ft-test-run.sh
      storage/myisam/mi_test_all.sh
      storage/myisam/myisampack.c
      storage/myisam/rt_index.c
      storage/ndb/Makefile.am
      storage/ndb/config/make-win-dsw.sh
      storage/ndb/config/win-includes
      storage/ndb/config/win-libraries
      storage/ndb/config/win-name
      storage/ndb/config/win-sources
      storage/ndb/docs/Makefile.am
      storage/ndb/docs/doxygen/Doxyfile.mgmapi
      storage/ndb/docs/doxygen/Doxyfile.ndb
      storage/ndb/docs/doxygen/Doxyfile.ndbapi
      storage/ndb/docs/doxygen/Doxyfile.odbc
      storage/ndb/docs/doxygen/postdoxy.pl
      storage/ndb/docs/doxygen/predoxy.pl
      storage/ndb/src/cw/cpcc-win32/csharp/CPC_Form.cs
      storage/ndb/src/cw/cpcc-win32/csharp/Computer.cs
      storage/ndb/src/cw/cpcc-win32/csharp/ComputerAddDialog.cs
      storage/ndb/src/cw/cpcc-win32/csharp/ComputerRemoveDialog.cs
      storage/ndb/src/cw/cpcc-win32/csharp/Database.cs
      storage/ndb/src/cw/cpcc-win32/csharp/PanelWizard.cs
      storage/ndb/src/cw/cpcc-win32/csharp/Process.cs
      storage/ndb/src/cw/cpcc-win32/csharp/ProcessDefineDialog.cs
      storage/ndb/src/cw/cpcc-win32/csharp/fileaccess/FileMgmt.cs
      storage/ndb/src/cw/cpcc-win32/csharp/simpleparser/SimpleCPCParser.cs
      storage/ndb/src/cw/cpcc-win32/csharp/socketcomm/SocketComm.cs
      storage/ndb/src/cw/cpcc-win32/csharp/socketcomm/myTcpClient.cs
      storage/ndb/src/cw/cpcc-win32/csharp/startDatabaseDlg.cs
      storage/ndb/src/cw/cpcc-win32/csharp/telnetclient/telnetClient.cs
      storage/ndb/src/libndb.ver.in
      storage/ndb/test/ndbapi/slow_select.cpp
      storage/ndb/test/ndbapi/testBitfield.cpp
      storage/ndb/test/ndbapi/testLcp.cpp
      storage/ndb/test/ndbnet/test.run
      storage/ndb/test/ndbnet/testError.run
      storage/ndb/test/ndbnet/testMNF.run
      storage/ndb/test/ndbnet/testNR.run
      storage/ndb/test/ndbnet/testNR1.run
      storage/ndb/test/ndbnet/testNR4.run
      storage/ndb/test/ndbnet/testSRhang.run
      storage/ndb/test/ndbnet/testTR295.run
      storage/ndb/test/run-test/16node-tests.txt
      storage/ndb/test/run-test/atrt-analyze-result.sh
      storage/ndb/test/run-test/atrt-clear-result.sh
      storage/ndb/test/run-test/atrt-gather-result.sh
      storage/ndb/test/run-test/atrt-mysql-test-run
      storage/ndb/test/run-test/atrt-setup.sh
      storage/ndb/test/run-test/atrt-testBackup
      storage/ndb/test/run-test/basic.txt
      storage/ndb/test/run-test/daily-basic-tests.txt
      storage/ndb/test/run-test/daily-devel-tests.txt
      storage/ndb/test/run-test/make-config.sh
      storage/ndb/test/run-test/make-html-reports.sh
      storage/ndb/test/run-test/make-index.sh
      storage/ndb/test/run-test/ndb-autotest.sh
      storage/ndb/test/sql/test_create_drop.pl
      storage/ndb/test/sql/test_range_bounds.pl
      storage/ndb/tools/clean-links.sh
      storage/ndb/tools/make-errors.pl
      storage/ndb/tools/make-links.sh
      storage/ndb/tools/ndb_error_reporter
      storage/ndb/tools/rgrep
      strings/strtod.c
      support-files/MacOSX/Description.plist.sh
      support-files/MacOSX/Info.plist.sh
      support-files/MacOSX/Makefile.am
      support-files/MacOSX/MySQLCOM
      support-files/MacOSX/StartupItem.Description.plist
      support-files/MacOSX/StartupItem.Info.plist
      support-files/MacOSX/StartupItem.postinstall
      support-files/MacOSX/StartupParameters.plist.sh
      support-files/MacOSX/mwar-wrapper
      support-files/MacOSX/mwcc-wrapper
      support-files/MacOSX/postflight.sh
      support-files/MacOSX/preflight.sh
      support-files/Makefile.am
      support-files/RHEL4-SElinux/Makefile.am
      support-files/RHEL4-SElinux/mysql.fc
      support-files/RHEL4-SElinux/mysql.te
      support-files/compiler_warnings.supp
      tests/Makefile.am
      tests/big_record.pl
      tests/drop_test.pl
      tests/export.pl
      tests/fork2_test.pl
      tests/fork_big.pl
      tests/fork_big2.pl
      tests/grant.pl
      tests/index_corrupt.pl
      tests/insert_and_repair.pl
      tests/lock_test.pl
      tests/mysql_client_test.c
      tests/pmail.pl
      tests/rename_test.pl
      tests/table_types.pl
      tests/test_delayed_insert.pl
      tests/truncate.pl
      win/create_manifest.js
      win/mysql_manifest.cmake
      mysql-test/extra/rpl_tests/rpl_extra_col_master.test
      mysql-test/extra/rpl_tests/rpl_extra_col_slave.test
      mysql-test/suite/rpl/t/rpl_stm_000001.test
      mysql-test/include/rpl_init.inc
      mysql-test/include/rpl_sync.inc
      mysql-test/include/rpl_diff.inc
      mysql-test/include/rpl_end.inc
      mysql-test/include/rpl_reset.inc
      mysql-test/suite/rpl/r/rpl_auto_increment_bug33029.result
      mysql-test/suite/rpl/t/rpl_auto_increment_bug33029.test
      mysql-test/suite/rpl/r/rpl_000010.result
      mysql-test/suite/rpl/r/rpl_000011.result
      mysql-test/suite/rpl/r/rpl_000013.result
      mysql-test/suite/rpl/r/rpl_000017.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_extra_col_master_innodb.result
      mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result
      mysql-test/suite/rpl/t/rpl_000010.test
      mysql-test/suite/rpl/t/rpl_000011.test
      mysql-test/suite/rpl/t/rpl_000013.test
      mysql-test/suite/rpl/t/rpl_000017.test
      mysql-test/suite/rpl/t/rpl_extra_col_slave_innodb.test
      mysql-test/suite/rpl/t/rpl_extra_col_slave_myisam.test
      mysql-test/suite/rpl/t/rpl_extra_col_master_innodb.test
      mysql-test/suite/rpl/t/rpl_extra_col_master_myisam.test
      mysql-test/suite/binlog/t/binlog_sf.test
 2961 Bjorn Munch	2010-12-20 [merge]
      new merge from 5.1

    removed:
      EXCEPTIONS-CLIENT
      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_plugin/r/innodb_bug54679.result
      mysql-test/suite/innodb_plugin/t/innodb_bug54679.test
      mysql-test/suite/rpl/t/rpl_binlog_max_cache_size-master.opt
      mysql-test/suite/sys_vars/README
      pstack/
      pstack/Makefile.am
      pstack/aout/
      pstack/aout/Makefile.am
      pstack/aout/aout64.h
      pstack/aout/stab.def
      pstack/aout/stab_gnu.h
      pstack/bucomm.c
      pstack/bucomm.h
      pstack/budbg.h
      pstack/debug.c
      pstack/debug.h
      pstack/demangle.h
      pstack/filemode.c
      pstack/ieee.c
      pstack/ieee.h
      pstack/libiberty.h
      pstack/linuxthreads.c
      pstack/linuxthreads.h
      pstack/pstack.c
      pstack/pstack.h
      pstack/pstacktrace.h
      pstack/rddbg.c
      pstack/stabs.c
      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
    added:
      mysql-test/collections/mysql-5.1-bugteam.daily
      mysql-test/collections/mysql-5.1-bugteam.push
      mysql-test/extra/rpl_tests/rpl_stop_slave.test
      mysql-test/include/ctype_8bit.inc
      mysql-test/include/io_thd_fault_injection.inc
      mysql-test/r/lowercase_table4.result
      mysql-test/suite/federated/federated_bug_35333.result
      mysql-test/suite/federated/federated_bug_35333.test
      mysql-test/suite/innodb/r/innodb_bug56143.result
      mysql-test/suite/innodb/r/innodb_bug56680.result
      mysql-test/suite/innodb/r/innodb_bug57252.result
      mysql-test/suite/innodb/t/innodb_bug56143.test
      mysql-test/suite/innodb/t/innodb_bug56680.test
      mysql-test/suite/innodb/t/innodb_bug57252.test
      mysql-test/suite/innodb_plugin/r/innodb-create-options.result
      mysql-test/suite/innodb_plugin/r/innodb_bug53046.result
      mysql-test/suite/innodb_plugin/r/innodb_bug56143.result
      mysql-test/suite/innodb_plugin/r/innodb_bug56680.result
      mysql-test/suite/innodb_plugin/r/innodb_bug56947.result
      mysql-test/suite/innodb_plugin/r/innodb_bug57252.result
      mysql-test/suite/innodb_plugin/t/innodb-create-options.test
      mysql-test/suite/innodb_plugin/t/innodb_bug53046.test
      mysql-test/suite/innodb_plugin/t/innodb_bug56143.test
      mysql-test/suite/innodb_plugin/t/innodb_bug56680.test
      mysql-test/suite/innodb_plugin/t/innodb_bug56947.test
      mysql-test/suite/innodb_plugin/t/innodb_bug57252.test
      mysql-test/suite/rpl/r/rpl_binlog_errors.result
      mysql-test/suite/rpl/r/rpl_stop_slave.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_stop_slave.test
      mysql-test/suite/sys_vars/t/disabled.def
      mysql-test/suite/sys_vars/t/innodb_commit_concurrency_basic-master.opt
      mysql-test/suite/sys_vars/t/myisam_data_pointer_size_func-master.opt
      mysql-test/suite/sys_vars/t/sql_log_off_func-master.opt
      mysql-test/t/lowercase_table4-master.opt
      mysql-test/t/lowercase_table4.test
    modified:
      .bzrignore
      BUILD/SETUP.sh
      BUILD/compile-pentium-mysqlfs-debug
      CMakeLists.txt
      Makefile.am
      README
      client/mysql.cc
      client/mysqltest.cc
      client/sql_string.h
      cmd-line-utils/libedit/common.c
      cmd-line-utils/libedit/filecomplete.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
      config/ac-macros/maintainer.m4
      configure.in
      dbug/dbug.c
      include/config-netware.h
      include/config-win.h
      include/m_ctype.h
      include/m_string.h
      include/my_compiler.h
      include/my_dbug.h
      include/my_global.h
      include/my_pthread.h
      include/my_stacktrace.h
      include/mysql_embed.h
      include/mysys_err.h
      libmysql/Makefile.am
      libmysql/Makefile.shared
      libmysql/conf_to_src.c
      libmysql/dll.c
      libmysql/errmsg.c
      libmysql/get_password.c
      libmysql/libmysql.c
      libmysql/manager.c
      libmysql_r/Makefile.am
      mysql-test/collections/default.experimental
      mysql-test/collections/default.weekly
      mysql-test/extra/binlog_tests/binlog.test
      mysql-test/extra/binlog_tests/binlog_failure_mixing_engines.test
      mysql-test/include/index_merge2.inc
      mysql-test/include/restart_mysqld.inc
      mysql-test/r/auto_increment.result
      mysql-test/r/change_user.result
      mysql-test/r/connect.result
      mysql-test/r/ctype_cp1251.result
      mysql-test/r/ctype_latin1.result
      mysql-test/r/ctype_ujis.result
      mysql-test/r/ctype_utf8.result
      mysql-test/r/date_formats.result
      mysql-test/r/derived.result
      mysql-test/r/explain.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_str.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/index_merge_innodb.result
      mysql-test/r/index_merge_myisam.result
      mysql-test/r/join_outer.result
      mysql-test/r/key_cache.result
      mysql-test/r/log_tables.result
      mysql-test/r/merge.result
      mysql-test/r/multi_update.result
      mysql-test/r/mysql.result
      mysql-test/r/mysqltest.result
      mysql-test/r/partition_innodb.result
      mysql-test/r/partition_innodb_plugin.result
      mysql-test/r/plugin_not_embedded.result
      mysql-test/r/show_check.result
      mysql-test/r/sp-bugs.result
      mysql-test/r/type_blob.result
      mysql-test/r/user_var.result
      mysql-test/r/variables-big.result
      mysql-test/r/variables.result
      mysql-test/r/view.result
      mysql-test/r/xml.result
      mysql-test/suite/binlog/r/binlog_index.result
      mysql-test/suite/binlog/r/binlog_mixed_failure_mixing_engines.result
      mysql-test/suite/binlog/r/binlog_row_binlog.result
      mysql-test/suite/binlog/r/binlog_row_failure_mixing_engines.result
      mysql-test/suite/binlog/r/binlog_stm_binlog.result
      mysql-test/suite/binlog/r/binlog_unsafe.result
      mysql-test/suite/binlog/t/binlog_index.test
      mysql-test/suite/binlog/t/disabled.def
      mysql-test/suite/innodb/r/innodb-autoinc.result
      mysql-test/suite/innodb/r/innodb_multi_update.result
      mysql-test/suite/innodb/r/innodb_mysql.result
      mysql-test/suite/innodb/t/innodb-autoinc.test
      mysql-test/suite/innodb/t/innodb_multi_update.test
      mysql-test/suite/innodb/t/innodb_mysql.test
      mysql-test/suite/innodb_plugin/r/innodb-autoinc.result
      mysql-test/suite/innodb_plugin/r/innodb-zip.result
      mysql-test/suite/innodb_plugin/r/innodb_multi_update.result
      mysql-test/suite/innodb_plugin/r/innodb_mysql.result
      mysql-test/suite/innodb_plugin/t/innodb-autoinc.test
      mysql-test/suite/innodb_plugin/t/innodb-zip.test
      mysql-test/suite/innodb_plugin/t/innodb_multi_update.test
      mysql-test/suite/innodb_plugin/t/innodb_mysql.test
      mysql-test/suite/parts/inc/part_supported_sql_funcs_main.inc
      mysql-test/suite/parts/inc/partition_auto_increment.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_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/parts/r/partition_decimal_innodb.result
      mysql-test/suite/parts/r/partition_decimal_myisam.result
      mysql-test/suite/parts/t/part_supported_sql_func_innodb.test
      mysql-test/suite/parts/t/partition_alter1_1_2_innodb.test
      mysql-test/suite/parts/t/partition_alter1_2_innodb.test
      mysql-test/suite/parts/t/partition_alter4_innodb.test
      mysql-test/suite/rpl/r/rpl_alter.result
      mysql-test/suite/rpl/r/rpl_binlog_max_cache_size.result
      mysql-test/suite/rpl/r/rpl_do_grant.result
      mysql-test/suite/rpl/r/rpl_stm_EE_err2.result
      mysql-test/suite/rpl/r/rpl_temp_table_mix_row.result
      mysql-test/suite/rpl/t/rpl_alter.test
      mysql-test/suite/rpl/t/rpl_binlog_max_cache_size.test
      mysql-test/suite/rpl/t/rpl_do_grant.test
      mysql-test/suite/rpl/t/rpl_temp_table_mix_row.test
      mysql-test/suite/sys_vars/inc/timestamp_basic.inc
      mysql-test/suite/sys_vars/r/general_log_file_basic.result
      mysql-test/suite/sys_vars/r/general_log_func.result
      mysql-test/suite/sys_vars/r/innodb_commit_concurrency_basic.result
      mysql-test/suite/sys_vars/r/log_output_basic.result
      mysql-test/suite/sys_vars/r/log_output_func.result
      mysql-test/suite/sys_vars/r/slow_query_log_file_basic.result
      mysql-test/suite/sys_vars/r/timestamp_basic_32.result
      mysql-test/suite/sys_vars/r/timestamp_basic_64.result
      mysql-test/suite/sys_vars/r/tmp_table_size_basic.result
      mysql-test/suite/sys_vars/t/completion_type_func.test
      mysql-test/suite/sys_vars/t/general_log_file_basic.test
      mysql-test/suite/sys_vars/t/general_log_func.test
      mysql-test/suite/sys_vars/t/innodb_commit_concurrency_basic.test
      mysql-test/suite/sys_vars/t/log_output_func.test
      mysql-test/suite/sys_vars/t/myisam_data_pointer_size_func.test
      mysql-test/suite/sys_vars/t/rpl_init_slave_func.test
      mysql-test/suite/sys_vars/t/slow_query_log_file_basic.test
      mysql-test/suite/sys_vars/t/timestamp_basic_32.test
      mysql-test/suite/sys_vars/t/timestamp_basic_64.test
      mysql-test/suite/sys_vars/t/tmp_table_size_basic.test
      mysql-test/t/auto_increment.test
      mysql-test/t/change_user.test
      mysql-test/t/connect.test
      mysql-test/t/ctype_cp1251.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/derived.test
      mysql-test/t/disabled.def
      mysql-test/t/explain.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_str.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/join_outer.test
      mysql-test/t/key_cache.test
      mysql-test/t/log_tables.test
      mysql-test/t/multi_update.test
      mysql-test/t/mysql.test
      mysql-test/t/mysqltest.test
      mysql-test/t/partition_innodb.test
      mysql-test/t/partition_innodb_plugin.test
      mysql-test/t/plugin_not_embedded.test
      mysql-test/t/sp-bugs.test
      mysql-test/t/type_blob.test
      mysql-test/t/user_var.test
      mysql-test/t/variables-big.test
      mysql-test/t/variables.test
      mysql-test/t/view.test
      mysql-test/t/xml.test
      mysys/errors.c
      mysys/mf_keycache.c
      mysys/my_gethostbyname.c
      mysys/my_gethwaddr.c
      mysys/my_getncpus.c
      mysys/my_seek.c
      mysys/my_symlink.c
      mysys/my_sync.c
      mysys/stacktrace.c
      mysys/thr_mutex.c
      regex/main.c
      regex/regexec.c
      scripts/make_binary_distribution.sh
      scripts/make_win_bin_dist
      sql/Makefile.am
      sql/debug_sync.cc
      sql/field_conv.cc
      sql/ha_ndbcluster.cc
      sql/ha_partition.cc
      sql/handler.cc
      sql/item.cc
      sql/item_cmpfunc.cc
      sql/item_func.cc
      sql/item_func.h
      sql/item_row.cc
      sql/item_strfunc.cc
      sql/item_subselect.cc
      sql/item_subselect.h
      sql/item_sum.cc
      sql/item_timefunc.cc
      sql/item_timefunc.h
      sql/item_xmlfunc.cc
      sql/lock.cc
      sql/log.cc
      sql/log.h
      sql/log_event.cc
      sql/log_event.h
      sql/my_decimal.cc
      sql/my_decimal.h
      sql/mysql_priv.h
      sql/mysqld.cc
      sql/opt_range.h
      sql/records.cc
      sql/rpl_injector.cc
      sql/rpl_rli.h
      sql/set_var.cc
      sql/set_var.h
      sql/share/charsets/cp1251.xml
      sql/slave.cc
      sql/slave.h
      sql/sp_head.cc
      sql/sql_acl.cc
      sql/sql_base.cc
      sql/sql_binlog.cc
      sql/sql_class.cc
      sql/sql_class.h
      sql/sql_connect.cc
      sql/sql_db.cc
      sql/sql_derived.cc
      sql/sql_help.cc
      sql/sql_insert.cc
      sql/sql_lex.cc
      sql/sql_lex.h
      sql/sql_load.cc
      sql/sql_parse.cc
      sql/sql_partition.cc
      sql/sql_plugin.cc
      sql/sql_plugin.h
      sql/sql_prepare.cc
      sql/sql_rename.cc
      sql/sql_select.cc
      sql/sql_show.cc
      sql/sql_string.h
      sql/sql_table.cc
      sql/sql_udf.cc
      sql/sql_union.cc
      sql/sql_update.cc
      sql/sql_view.cc
      sql/sql_yacc.yy
      storage/innobase/buf/buf0buf.c
      storage/innobase/buf/buf0flu.c
      storage/innobase/buf/buf0lru.c
      storage/innobase/dict/dict0load.c
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/handler/ha_innodb.h
      storage/innobase/ibuf/ibuf0ibuf.c
      storage/innobase/include/buf0flu.h
      storage/innobase/include/buf0lru.h
      storage/innobase/include/ibuf0ibuf.h
      storage/innobase/include/rem0rec.h
      storage/innobase/include/rem0rec.ic
      storage/innobase/include/row0mysql.h
      storage/innobase/include/row0upd.h
      storage/innobase/include/ut0dbg.h
      storage/innobase/os/os0file.c
      storage/innobase/row/row0mysql.c
      storage/innobase/row/row0sel.c
      storage/innobase/row/row0upd.c
      storage/innobase/srv/srv0start.c
      storage/innobase/sync/sync0rw.c
      storage/innobase/trx/trx0undo.c
      storage/innodb_plugin/ChangeLog
      storage/innodb_plugin/btr/btr0cur.c
      storage/innodb_plugin/buf/buf0buf.c
      storage/innodb_plugin/buf/buf0flu.c
      storage/innodb_plugin/dict/dict0crea.c
      storage/innodb_plugin/dict/dict0dict.c
      storage/innodb_plugin/dict/dict0load.c
      storage/innodb_plugin/fil/fil0fil.c
      storage/innodb_plugin/fsp/fsp0fsp.c
      storage/innodb_plugin/handler/ha_innodb.cc
      storage/innodb_plugin/handler/ha_innodb.h
      storage/innodb_plugin/handler/handler0alter.cc
      storage/innodb_plugin/ibuf/ibuf0ibuf.c
      storage/innodb_plugin/include/btr0btr.h
      storage/innodb_plugin/include/btr0btr.ic
      storage/innodb_plugin/include/btr0cur.h
      storage/innodb_plugin/include/buf0flu.h
      storage/innodb_plugin/include/dict0dict.h
      storage/innodb_plugin/include/fil0fil.h
      storage/innodb_plugin/include/ibuf0ibuf.h
      storage/innodb_plugin/include/row0ins.h
      storage/innodb_plugin/include/row0mysql.h
      storage/innodb_plugin/include/row0upd.h
      storage/innodb_plugin/include/univ.i
      storage/innodb_plugin/os/os0file.c
      storage/innodb_plugin/plug.in
      storage/innodb_plugin/row/row0ins.c
      storage/innodb_plugin/row/row0merge.c
      storage/innodb_plugin/row/row0mysql.c
      storage/innodb_plugin/row/row0sel.c
      storage/innodb_plugin/row/row0upd.c
      storage/innodb_plugin/srv/srv0start.c
      storage/innodb_plugin/sync/sync0rw.c
      storage/innodb_plugin/thr/thr0loc.c
      storage/innodb_plugin/trx/trx0i_s.c
      storage/innodb_plugin/trx/trx0undo.c
      storage/myisam/ft_nlq_search.c
      storage/myisam/ha_myisam.cc
      storage/myisam/mi_check.c
      storage/myisam/mi_create.c
      storage/myisam/myisamchk.c
      storage/myisammrg/ha_myisammrg.cc
      storage/myisammrg/myrg_open.c
      strings/CHARSET_INFO.txt
      strings/ctype-extra.c
      strings/my_strchr.c
      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
      win/configure.js

Diff too large for email (34622 lines, the limit is 10000).
No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.1-mtr branch (bjorn.munch:2961 to 2962) Bjorn Munch29 Dec