An error occurred fetching the project authors.
  1. 05 Dec, 2016 1 commit
    • Elena Stepanova's avatar
      MDEV-9038 Binlog encryption tests · 611f9160
      Elena Stepanova authored
      - created binlog_encryption test suite and added it to the default list
      - moved some tests from rpl, binlog and multisource suites to extra
        so that they could be re-used in different suites
      - made minor changes in include files
      611f9160
  2. 19 Dec, 2010 2 commits
    • Sven Sandberg's avatar
      BUG#49978: Replication tests don't clean up replication state at the end · 8b27f9a0
      Sven Sandberg authored
      Major replication test framework cleanup. This does the following:
       - Ensure that all tests clean up the replication state when they
         finish, by making check-testcase check the output of SHOW SLAVE STATUS.
         This implies:
          - Slave must not be running after test finished. This is good
            because it removes the risk for sporadic errors in subsequent
            tests when a test forgets to sync correctly.
          - Slave SQL and IO errors must be cleared when test ends. This is
            good because we will notice if a test gets an unexpected error in
            the slave threads near the end.
          - We no longer have to clean up before a test starts.
       - Ensure that all tests that wait for an error in one of the slave
         threads waits for a specific error. It is no longer possible to
         source wait_for_slave_[sql|io]_to_stop.inc when there is an error
         in one of the slave threads. This is good because:
          - If a test expects an error but there is a bug that causes
            another error to happen, or if it stops the slave thread without
            an error, then we will notice.
          - When developing tests, wait_for_*_to_[start|stop].inc will fail
            immediately if there is an error in the relevant slave thread.
            Before this patch, we had to wait for the timeout.
       - Remove duplicated and repeated code for setting up unusual replication
         topologies. Now, there is a single file that is capable of setting
         up arbitrary topologies (include/rpl_init.inc, but
         include/master-slave.inc is still available for the most common
         topology). Tests can now end with include/rpl_end.inc, which will clean
         up correctly no matter what topology is used. The topology can be
         changed with include/rpl_change_topology.inc.
       - Improved debug information when tests fail. This includes:
          - debug info is printed on all servers configured by include/rpl_init.inc
          - User can set $rpl_debug=1, which makes auxiliary replication files
            print relevant debug info.
       - Improved documentation for all auxiliary replication files. Now they
         describe purpose, usage, parameters, and side effects.
       - Many small code cleanups:
          - Made have_innodb.inc output a sensible error message.
          - Moved contents of rpl000017-slave.sh into rpl000017.test
          - Added mysqltest variables that expose the current state of
            disable_warnings/enable_warnings and friends.
          - Too many to list here: see per-file comments for details.
      
      
      client/mysqltest.cc:
        Added the following variables:
         $ENABLED_WARNINGS
         $ENABLED_QUERY_LOG
         $ENABLED_RESULT_LOG
         $ENABLED_ABORT_ON_ERROR
         $ENABLED_INFO
         $ENABLED_METADATA
        Each variable is 0 or 1, depending on if the corresponding
        mysqltest feature is on or off.
      mysql-test/extra/rpl_tests/rpl_EE_err.test:
        Made test clean up after itself and removed outdated comments.
      mysql-test/extra/rpl_tests/rpl_auto_increment.test:
        - Use rpl_reset.inc instead of master-slave-reset.inc
        - diff_tables.inc now takes only one parameter.
        Made test clean up after itself and removed outdated comments.
      mysql-test/extra/rpl_tests/rpl_auto_increment_insert_view.test:
        diff_tables.inc now takes only one parameter.
      mysql-test/extra/rpl_tests/rpl_auto_increment_invoke_trigger.test:
        diff_tables.inc now takes only one parameter.
      mysql-test/extra/rpl_tests/rpl_autoinc_func_invokes_trigger.test:
        diff_tables.inc now takes only one parameter.
      mysql-test/extra/rpl_tests/rpl_charset.test:
        Made test clean up after itself and removed unnecessary cleanup in beginning.
      mysql-test/extra/rpl_tests/rpl_commit_after_flush.test:
        cosmetic fixes
      mysql-test/extra/rpl_tests/rpl_conflicts.test:
        cosmetic fixes
      mysql-test/extra/rpl_tests/rpl_ddl.test:
        Don't clean up replication here since this file does not setup
        replication. The main test now has to both setup and clean up
        replication.
        cosmetic fixes
      mysql-test/extra/rpl_tests/rpl_deadlock.test:
        make test clean up after itself
      mysql-test/extra/rpl_tests/rpl_extra_col_master.test:
        cosmetic fixes
      mysql-test/extra/rpl_tests/rpl_extra_col_slave.test:
        made test clean up after itself
        cosmetic fixes
      mysql-test/extra/rpl_tests/rpl_failed_optimize.test:
        made test clean up after itself
      mysql-test/extra/rpl_tests/rpl_flsh_tbls.test:
        made test clean up after itself
      mysql-test/extra/rpl_tests/rpl_foreign_key.test:
        made test clean up after itself
      mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test:
         - Replace 'start slave; wait_for_slave_to_start.inc' by
           include/start_slave.inc.
         - Use new file rpl_connect.inc to reconnect on all connections, since the
           connections are used by rpl_end.inc.
         - Use wait_for_slave_param.inc instead of wait_for_slave_io_to_start.inc,
           since wait_for_slave_io_to_start.inc now fails if the IO thread has
           an error. In this particular test case, it is normal that the IO thread
           has an error.
         - Changed wait_for_slave_io_error.inc so that it waits
           for the IO thread to stop. However, in this test case,
           the IO thread only gets a non-fatal error, so it does
           not stop. So we set $slave_io_error_is_nonfatal=1 to
           prevent wait_for_slave_io_error.inc from waiting.
      mysql-test/extra/rpl_tests/rpl_insert_id.test:
        made test clean up after itself
        cosmetic fixes
      mysql-test/extra/rpl_tests/rpl_insert_id_pk.test:
        made test clean up after itself
        cosmetic fixes
      mysql-test/extra/rpl_tests/rpl_loaddata.test:
         - Use wait_for_slave_sql_error.inc to wait for errors
           instead of wait_for_slave_sql_to_stop.inc
         - Use check_slave_no_error.inc instead of print errors
           to the log.
         - Use rpl_reset.inc instead of master-slave-reset.inc
           This means we have to clear the error from the slave
           threads by calling RESET SLAVE explicitly.
         - diff_tables.inc now takes only one parameter.
      mysql-test/extra/rpl_tests/rpl_log.test:
        replace master-slave-reset.inc by rpl_reset.inc
      mysql-test/extra/rpl_tests/rpl_max_relay_size.test:
        made test clean up after itself
        cosmetic fix
      mysql-test/extra/rpl_tests/rpl_multi_query.test:
        made test clean up after itself
        cosmetic fixes
      mysql-test/extra/rpl_tests/rpl_multi_update.test:
        made test clean up after itself
        cosmetic fixes
      mysql-test/extra/rpl_tests/rpl_ndb_apply_status.test:
        replace master-slave-reset.inc by rpl_reset.inc
      mysql-test/extra/rpl_tests/rpl_not_null.test:
        - replace master-slave-reset.inc by rpl_reset.inc
        - diff_tables.inc now takes only one parameter.
      mysql-test/extra/rpl_tests/rpl_record_compare.test:
        - replace master-slave-reset.inc by rpl_reset.inc
        - diff_tables.inc now takes only one parameter.
      mysql-test/extra/rpl_tests/rpl_reset_slave.test:
        - replace wait_for_slave_io_error.inc+stop_slave.inc by
          wait_for_slave_io_error_and_stop.inc+stop_slave_sql.inc
          since stop_slave.inc now fails when the io thread has an
          error.
        - replace stop_slave.inc by STOP SLAVE +
          wait_for_slave_sql_to_stop.inc +
          wait_for_slave_param. stop_slave.inc would fail since
          the IO thread has an error.
        - add include/rpl_end.inc to clean up replication state
      mysql-test/extra/rpl_tests/rpl_row_UUID.test:
        Don't clean up replication here since this file does not setup
        replication. The main test now has to both setup and clean up
        replication.
      mysql-test/extra/rpl_tests/rpl_row_basic.test:
        - replaced reset_master_and_slave.inc by rpl_reset.inc
        - replaced sequence of reset master+reset slave by rpl_reset.inc
        - diff_tables.inc now takes only one parameter.
      mysql-test/extra/rpl_tests/rpl_row_delayed_ins.test:
        made test clean up after itself
        cosmetic fixes
      mysql-test/extra/rpl_tests/rpl_row_sp002.test:
        made test clean up after itself
        cosmetic fixes
      mysql-test/extra/rpl_tests/rpl_row_sp007.test:
        made test clean up after itself
        cosmetic fixes
      mysql-test/extra/rpl_tests/rpl_set_null.test:
        - replaced master-slave-reset.inc by rpl_reset.inc
        - diff_tables.inc now takes only one parameter.
      mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test:
        - Made test clean up replication state.
      mysql-test/extra/rpl_tests/rpl_stm_create_if_not_exists.test:
        replaced rpl_diff_tables.inc by diff_tables.inc
      mysql-test/extra/rpl_tests/rpl_stop_slave.test:
        changed protocol for diff_tables.inc
      mysql-test/extra/rpl_tests/rpl_sv_relay_space.test:
        made test clean up after itself
        cosmetic fixes
      mysql-test/extra/rpl_tests/rpl_test_framework.inc:
        Auxiliary file used by rpl_test_framework.test.
        This checks that rpl_change_topology.inc works correctly.
      mysql-test/extra/rpl_tests/rpl_truncate.test:
        made test clean up after itself
        cosmetic fixes
      mysql-test/extra/rpl_tests/rpl_truncate_helper.test:
        - replace reset_master_and_slave.inc by rpl_reset.inc
        - diff_tables.inc now takes only one parameter.
      mysql-test/include/analyze-sync_with_master.test:
        - improved debug output printed when sync_slave_with_master or
          sync_with_master fails
        - Added documentation
      mysql-test/include/assert.inc:
        Added file to facilitate assertions.
      mysql-test/include/begin_include_file.inc:
        New auxiliary file to be used by replication helper files like
        rpl_init.inc, stop_slave.inc, wait_for_slave_*.inc, etc. Such
        helper files should source rpl_begin_include_file.inc at the
        beginning and rpl_end_include_file.inc at the end. That adds the
        following features:
         - When a test sources the file, the file name is printed to the
           result file. This is good because it makes result files easier to
           follow.
         - When a helper file sources a second helper file recursively, then
           the name of the second file is not printed. This is good because
           it would make the result file harder to follow if all the internal
           calls of all helper files were printed.
         - When $rpl_debug is set, all internal calls are printed to the
           result file. This is good because it helps when debugging test
           cases. (With $rpl_debug=1, many of the helper files now print other
           relevant debug info too.)
         - When a file needs to turn off the query log or the warning log
           (disable_query_log/disable_warnings), then the file can tell
           rpl_begin_include_file.inc about it. Then rpl_begin_include_file.inc
           will turn off the log correctly, and rpl_end_include_file.inc
           will turn on the log correctly. Note that if rpl_a.inc sources
           rpl_b.inc and both files need to turn off the log, then the
           log is not turned on when rpl_b.inc ends (because rpl_a.inc
           still needs the log off). This makes it easier to program
           replication helper files.
      mysql-test/include/check-testcase.test:
        Made check-testcase ensure that the slave status is reset
        after the test has finished.
      mysql-test/include/check_slave_is_running.inc:
        - Use existing framework (check_slave_param.inc) instead of ad-hoc code
          to check value of slave parameters.
        - Use rpl_begin_include_file.inc to improve debug capabilities.
        - improve documentation.
      mysql-test/include/check_slave_no_error.inc:
        - Use rpl_begin_include_file.inc to improve debug capabilities.
        - improve documentation.
      mysql-test/include/check_slave_param.inc:
        - Use rpl_begin_include_file.inc to improve debug capabilities.
        - improve documentation.
      mysql-test/include/cleanup_fake_relay_log.inc:
        - Use RESET SLAVE instead of manual file removal. This also
          resets other replication state.
        - verify that RESET SLAVE correctly removed files.
      mysql-test/include/diff_tables.inc:
         - Use rpl_begin_include_file.inc to improve debug capabilities.
         - Improved documentation.
         - file now supports an arbitrary number of tables
           (not just two). The tables are now given as a comma-separated
           list instead of as two variables.
         - You no longer have to specify database name for each table.
           If no database is specified, it defaults to the current
           database.
         - File now restores the connection at the end.
      mysql-test/include/end_include_file.inc:
        New file to be sourced at the end of auxiliary replication include
        files. See include/rpl_begin_include_file.inc for details.
      mysql-test/include/file_does_not_exist.inc:
        Added .inc file to check that a given file is removed.
      mysql-test/include/force_restart.inc:
        Added file to force server restart after test
      mysql-test/include/force_restart_if_skipped.inc:
        Added file to force server restart after test, if the test is skipped
      mysql-test/include/have_innodb.inc:
        Made have_innodb.inc print sensible message when innodb is
        not supported.
      mysql-test/include/io_thd_fault_injection.inc:
        Use rpl_server_restart.inc instead of restart_mysqld.inc in rpl tests
      mysql-test/include/kill_query_and_diff_master_slave.inc:
        Renamed diff_master_slave.inc to rpl_diff.inc
      mysql-test/include/master-slave.inc:
        - Use new rpl_init.inc file
        - Now, we don't do 'drop table' in master-slave.inc any more. That's good
          because drop table has nothing to do with configuring replication servers.
        - master-slave.inc now supports the additional parameter
          $rpl_server_count. By default, master-slave.inc only
          configures two servers; if $rpl_server_count is set, it
          configures that many servers. Only the second server is
          a slave; the rest are not part of the replication topology.
      mysql-test/include/mtr_check.sql:
        Removed unneeded SP (use include/force_restart.inc instead)
      mysql-test/include/mysqldump.inc:
        diff_tables.inc now takes only one parameter.
      mysql-test/include/ndb_master-slave.inc:
        use master-slave.inc instead of ad-hoc calls to 'connect'
      mysql-test/include/ndb_master-slave_2ch.inc:
        use rpl_init.inc instead of ad-hoc setup
      mysql-test/include/ndb_not_readonly.inc:
        turn off query log while executing this script.
        this was previously done by the caller. now it's done in the script.
      mysql-test/include/report-features.test:
        add newline at end of file
      mysql-test/include/reset_master_and_slave.inc:
        rpl_reset.inc replaces this file
      mysql-test/include/restart_mysqld.inc:
        force caller to use rpl_restart_server.inc instead if replication is configured
      mysql-test/include/rpl_change_topology.inc:
        New file to change replication topology on the fly. This is used
        by rpl_init.inc internally, but is also used by test cases
        that need to change topology (e.g., rpl.rpl_circular_for_4_hosts, which
        reconfigures the topology to make a failover).
      mysql-test/include/rpl_connect.inc:
        New file to create a named connection. This file knows about a number
        of "standard" connections (master, slave, server_1, etc), and knows how
        each of them should normally be created. This is mostly used internally
        (e.g., by rpl_init.inc, master-slave.inc, ndb_master-slave_2ch.inc etc),
        but can also be used by tests that need to bring a connection up after
        disconnecting.
      mysql-test/include/rpl_connection.inc:
        New file to change connection. This prints the name of the connection.
        However, for files that source rpl_begin_include_file.inc, it does not
        print the name of the connection unless $rpl_debug=1. This is good
        because printing something every time the .inc file changed connection
        would make the result log harder to read.
      mysql-test/include/rpl_diff.inc:
         - Made file capable to compare many servers
         - Hence renamed it to rpl_diff.inc
         - If no server list is specified, use all servers from
           server_1 to server_$rpl_server_count
         - It now writes the statement to file before executing it.
           That means it will be subject to SQL string interpolation,
           but not shell string interpolation (which may be
           platform-dependent)
      mysql-test/include/rpl_diff_tables.inc:
        Removed this file, since its functionality has been merged into
        diff_tables.inc.
      mysql-test/include/rpl_end.inc:
        Renamed master-slave-end.inc to rpl_end.inc, and made it
        work with arbitrary replication topologies (as configured
        with rpl_init.inc and possibly rpl_change_topology.inc). Also
        made it assert that no slave thread has an error. Made it
        assert that no slave thread is stopped, unless
        $rpl_only_running_threads=1.
      mysql-test/include/rpl_for_each_slave.inc:
        New test script that executes a command once for each slave.
        This is used by include/rpl_start_slaves.inc and
        include/rpl_stop_slaves.inc and could possibly be useful for other
        custom scripts too.
      mysql-test/include/rpl_generate_sync_chain.inc:
        New file that computes the variable $rpl_sync_chain. This variable
        determines in what order slaves are synced by include/rpl_sync.inc.
        The variable is recomputed the first time that include/rpl_sync.inc
        is called after rpl_change_topology.inc.
      mysql-test/include/rpl_init.inc:
        Made file work for arbitrary topologies instead of just 4-server
        circle. This file is used by master-slave.inc, rpl_master-slave_2ch.inc
        etc, and also by tests that need other specific replication topologies.
      mysql-test/include/rpl_reconnect.inc:
        New auxiliary file that will reconnect many clients to a given
        server. All clients configured by rpl_init.inc will reconnect.
      mysql-test/include/rpl_reset.inc:
        Made file work for arbitrary replication topologies,
        check for errors, and sync all threads. Also removed
        'drop table' because that has nothing to do with replication.
      mysql-test/include/rpl_restart_server.inc:
        New auxiliary file that restarts a server.
      mysql-test/include/rpl_start_server.inc:
        New auxiliary file that starts a server that has been shut down.
      mysql-test/include/rpl_start_slaves.inc:
        New auxiliary file to start all slaves configured by rpl_init.inc
        This is used internally by rpl_init.inc but may also be used by tests
        that want to bring all slaves up.
      mysql-test/include/rpl_stop_server.inc:
        New auxiliary file that shuts down a server.
      mysql-test/include/rpl_stop_slaves.inc:
        New auxiliary file to stop all slaves configured rpl_init.inc. This
        is used internally by rpl_end.inc, but may also be used by tests that
        want to stop all slaves.
      mysql-test/include/rpl_sync.inc:
        Made file work for arbitrary replication topologies (as configured
        by rpl_init.inc and possibly rpl_change_topology.inc) instead of
        just 4-server circle.
      mysql-test/include/save_master_pos.inc:
        Auxiliary file to save the master position.
      mysql-test/include/setup_fake_relay_log.inc:
        - Moved complicated logic to write to file into
          write_var_to_file.inc, so that it can be re-used by
          other tests.
        - Added call to show_rpl_debug_info and die in error case.
      mysql-test/include/show_rpl_debug_info.inc:
        - Made file print NOW()
        - Made file print both SHOW MASTER STATUS, SHOW SLAVE HOSTS,
          and SHOW SLAVE STATUS.
        - Made file print debug info for all servers configured by
          rpl_init.inc
      mysql-test/include/show_slave_status.inc:
        - Made file use echo instead of SELECT to print variables.
        - Improved comments.
        - Use variable names that are less likely to be used by other tests.
      mysql-test/include/start_slave.inc:
        - Made test use rpl_begin_include_file.inc to improve debug
          capabilities.
        - improved documentation
      mysql-test/include/stop_slave.inc:
        - Made script capable to detect which threads are running
          and stop only those.
        - Improved documentation
      mysql-test/include/stop_slave_io.inc:
        Added file to stop the slave IO thread.
      mysql-test/include/stop_slave_sql.inc:
        Added file to stop the slave SQL thread.
      mysql-test/include/sync_io_with_master.inc:
        Added file to sync the IO thread of the current connection, up to
        a previously saved position.
      mysql-test/include/sync_slave_io_with_master.inc:
        - Made file work with arbitrarily-named connections.
        - Made file use rpl_begin_include_file.inc to improve debug
          capabilities.
      mysql-test/include/sync_slave_sql_with_io.inc:
        Added file to sync only the SQL thread, up to the position copied
        in the IO thread.
      mysql-test/include/wait_for_query_to_fail.inc:
        Added file to wait for a query to fail.
      mysql-test/include/wait_for_slave_io_error.inc:
        - Use rpl_begin_include_file.inc to improve debug capabilities.
        - Use existing atom include/show_slave_status.inc to print error
          message.
        - Improve comments.
        
        ******
         - This file now waits until the slave IO thread has completely
           stopped (to avoid races in tests).
         - Some IO thread errors are non-fatal and don't cause the slave
           IO thread to stop. To allow tests to wait for such errors, we
           add the parameters $slave_io_error_is_nonfatal. If
           $slave_io_error_is_nonfatal is set, this script does not wait
           for the IO thread to stop.
      mysql-test/include/wait_for_slave_io_to_start.inc:
        - Made script fail if the IO thread has an error.
        - Use rpl_begin_include_file.inc to improve debug capabilities.
        - Improved documentation.
      mysql-test/include/wait_for_slave_io_to_stop.inc:
        - Fail if server is not configured as slave. Previously, the
          script accepted servers not configured as slave because there
          was cleanup code called from master-slave.inc that would execute
          STOP SLAVE on both master and slave. Now all tests have to
          clean up after themselves, so we don't have to call stop slave
          at the beginning of tests. Hence, we disallow calling this
          script on servers not configured as slaves.
        - Use rpl_begin_include_file.inc to improve debug capabilities.
        - Improved documentation.
      mysql-test/include/wait_for_slave_param.inc:
        - Added $slave_error_param. This variable can be set to
          Slave_IO_Errno or Slave_SQL_Errno, in which case the
          script fails if the corresponding column in the output from
          SHOW SLAVE STATUS is nonzero.
        - Replaced exit by die.
        - Made it print timeout seconds correctly in error message.
        - Removed $slave_error_message. This is not needed.
        - Use rpl_begin_include_file.inc for better debug capabilities.
      mysql-test/include/wait_for_slave_sql_error.inc:
        - Use rpl_begin_include_file.inc for better debug capabilities.
        - Improve documentation
        - Use existing atom show_slave_status.inc to print error.
      mysql-test/include/wait_for_slave_sql_error_and_skip.inc:
        - Use rpl_begin_include_file.inc and rpl_connection.inc for better
          debug capabilities.
        - Improve documentation
      mysql-test/include/wait_for_slave_sql_to_start.inc:
        - Use rpl_begin_include_file.inc for better debug capabilities.
        - Improve documentation
      mysql-test/include/wait_for_slave_sql_to_stop.inc:
        - Fail if Last_SQL_Errno is nonzero.
        - Fail if server is not configured as slave. Previously, the
          script accepted servers not configured as slave because there
          was cleanup code called from master-slave.inc that would execute
          STOP SLAVE on both master and slave. Now all tests have to
          clean up after themselves, so we don't have to call stop slave
          at the beginning of tests. Hence, we disallow calling this
          script on servers not configured as slaves.
        - Use rpl_begin_include_file.inc for better debug capabilities.
        - Improve documentation
      mysql-test/include/wait_for_slave_to_start.inc:
        - Use rpl_begin_include_file.inc for better debug capabilities.
        - Improve documentation
      mysql-test/include/wait_for_slave_to_stop.inc:
        - Use rpl_begin_include_file.inc for better debug capabilities.
        - Improve documentation
      mysql-test/include/write_var_to_file.inc:
        Added file to write contents of a mysqltest variable to file.
        (This was previously in setup_fake_relay_log.inc)
      mysql-test/mysql-test-run.pl:
        Allow tests to require restart in case the test is skipped.
      mysql-test/r/init_file.result:
        updated result file
      mysql-test/r/mysqldump_restore.result:
        update result file
      mysql-test/suite/binlog/r/binlog_drop_if_exists.result:
        Moved test that does not use replication to binlog suite.
      mysql-test/suite/binlog/r/binlog_old_versions.result:
        updated result file
      mysql-test/suite/binlog/r/binlog_query_filter_rules.result:
        Moved test that does not use replication to binlog suite.
      mysql-test/suite/binlog/r/binlog_server_id.result:
        Moved test that does not use replication to binlog suite.
      mysql-test/suite/binlog/r/binlog_sf.result:
        Moved test that does not use replication to binlog suite.
      mysql-test/suite/binlog/r/binlog_sql_mode.result:
        updated result file
      mysql-test/suite/binlog/t/binlog_auto_increment_bug33029-master.opt:
        This test replicates, so it should be in the rpl suite.
        Then we can remove this .opt file too.
      mysql-test/suite/binlog/t/binlog_drop_if_exists.test:
        Moved test that does not use replication to binlog suite.
      mysql-test/suite/binlog/t/binlog_old_versions.test:
        cosmetic fixes
      mysql-test/suite/binlog/t/binlog_query_filter_rules-master.opt:
        Moved test that does not use replication to binlog suite.
      mysql-test/suite/binlog/t/binlog_query_filter_rules.test:
        Moved test that does not use replication to binlog suite.
      mysql-test/suite/binlog/t/binlog_server_id.test:
        Moved test that does not use replication to binlog suite.
      mysql-test/suite/binlog/t/binlog_sf.test:
        Moved test that does not use replication to binlog suite.
        Since test sets binlog_format internally, it's useless to
        re-run it. Hence we source have_binlog_format_statement.inc
      mysql-test/suite/binlog/t/binlog_sql_mode.test:
        - Test does not use replication, so we remove master-slave.inc.
        - mysqltest magically adds --force-if-open to $MYSQL_BINLOG in test
          files that source master-slave.inc. So now we have to add
          --force-if-open explicitly.
      mysql-test/suite/bugs/t/rpl_bug12691.test:
        made test clean up after itself
        cosmetic fixes
      mysql-test/suite/bugs/t/rpl_bug23533.test:
        made test clean up after itself
        cosmetic fixes
      mysql-test/suite/bugs/t/rpl_bug31582.test:
        made test clean up after itself
      mysql-test/suite/bugs/t/rpl_bug31583.test:
        made test clean up after itself
      mysql-test/suite/bugs/t/rpl_bug33029.test:
        made test clean up after itself
      mysql-test/suite/bugs/t/rpl_bug36391.test:
        made test clean up after itself
        cosmetic fixes
      mysql-test/suite/bugs/t/rpl_bug37426.test:
        made test clean up after itself
        cosmetic fixes
      mysql-test/suite/bugs/t/rpl_bug38205.test:
        made test clean up after itself
      mysql-test/suite/manual/t/rpl_replication_delay.test:
        made test clean up after itself
        cosmetic fixes
      mysql-test/suite/ndb_team/t/rpl_ndb_dd_advance.test:
        made test clean up after itself
        cosmetic fixes
      mysql-test/suite/ndb_team/t/rpl_ndb_extraColMaster.test:
        made test clean up after itself
      mysql-test/suite/ndb_team/t/rpl_ndb_mix_innodb.test:
        made test clean up after itself
        cosmetic fixes
      mysql-test/suite/parts/r/rpl_partition.result:
        updated result file
      mysql-test/suite/parts/t/rpl_partition.test:
        Make test clean up replication state.
        cosmetic fixes
      mysql-test/suite/rpl/include/rpl_mixed_ddl.inc:
        made test clean up after itself
        cosmetic fixes
      mysql-test/suite/rpl/include/rpl_mixed_dml.inc:
        made test clean up after itself
        cosmetic fixes
      mysql-test/suite/rpl/r/rpl_000010.result:
        update result file
      mysql-test/suite/rpl/r/rpl_000011.result:
        update result file
      mysql-test/suite/rpl/r/rpl_000013.result:
        update result file
      mysql-test/suite/rpl/r/rpl_000017.result:
        update result file
      mysql-test/suite/rpl/r/rpl_EE_err.result:
        update result file
      mysql-test/suite/rpl/r/rpl_LD_INFILE.result:
        update result file
      mysql-test/suite/rpl/r/rpl_alter.result:
        update result file
      mysql-test/suite/rpl/r/rpl_alter_db.result:
        update result file
      mysql-test/suite/rpl/r/rpl_auto_increment.result:
        update result file
      mysql-test/suite/rpl/r/rpl_auto_increment_11932.result:
        update result file
      mysql-test/suite/rpl/r/rpl_auto_increment_bug33029.result:
        update result file
      mysql-test/suite/rpl/r/rpl_auto_increment_update_failure.result:
        update result file
      mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result:
        update result file
      mysql-test/suite/rpl/r/rpl_binlog_corruption.result:
        Updated result file
      mysql-test/suite/rpl/r/rpl_binlog_errors.result:
        updated result file
      mysql-test/suite/rpl/r/rpl_binlog_grant.result:
        update result file
      mysql-test/suite/rpl/r/rpl_binlog_max_cache_size.result:
        Updated result file
      mysql-test/suite/rpl/r/rpl_bit.result:
        update result file
      mysql-test/suite/rpl/r/rpl_bit_npk.result:
        update result file
      mysql-test/suite/rpl/r/rpl_blackhole.result:
        update result file
      mysql-test/suite/rpl/r/rpl_bug26395.result:
        update result file
      mysql-test/suite/rpl/r/rpl_bug31076.result:
        update result file
      mysql-test/suite/rpl/r/rpl_bug33931.result:
        updated result file
      mysql-test/suite/rpl/r/rpl_bug38694.result:
        update result file
      mysql-test/suite/rpl/r/rpl_change_master.result:
        update result file
      mysql-test/suite/rpl/r/rpl_charset.result:
        update result file
      mysql-test/suite/rpl/r/rpl_charset_sjis.result:
        update result file
      mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result:
        Updated result file
      mysql-test/suite/rpl/r/rpl_colSize.result:
        update result file
      mysql-test/suite/rpl/r/rpl_commit_after_flush.result:
        update result file
      mysql-test/suite/rpl/r/rpl_concurrency_error.result:
        update result file
      mysql-test/suite/rpl/r/rpl_conditional_comments.result:
        update result file
      mysql-test/suite/rpl/r/rpl_create_database.result:
        update result file
      mysql-test/suite/rpl/r/rpl_create_if_not_exists.result:
        update result file
      mysql-test/suite/rpl/r/rpl_create_tmp_table_if_not_exists.result:
        update result file
      mysql-test/suite/rpl/r/rpl_cross_version.result:
        Updated result file
      mysql-test/suite/rpl/r/rpl_current_user.result:
        update result file
      mysql-test/suite/rpl/r/rpl_deadlock_innodb.result:
        update result file
      mysql-test/suite/rpl/r/rpl_delete_no_where.result:
        update result file
      mysql-test/suite/rpl/r/rpl_do_grant.result:
        updated result file
      mysql-test/suite/rpl/r/rpl_drop.result:
        update result file
      mysql-test/suite/rpl/r/rpl_drop_db.result:
        update result file
      mysql-test/suite/rpl/r/rpl_drop_temp.result:
        update result file
      mysql-test/suite/rpl/r/rpl_drop_view.result:
        update result file
      mysql-test/suite/rpl/r/rpl_dual_pos_advance.result:
        update result file
      mysql-test/suite/rpl/r/rpl_empty_master_crash.result:
        update result file
      mysql-test/suite/rpl/r/rpl_err_ignoredtable.result:
        update result file
      mysql-test/suite/rpl/r/rpl_events.result:
        update result file
      mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result:
        update result file
      mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result:
        update result file
      mysql-test/suite/rpl/r/rpl_extra_col_slave_innodb.result:
        update result file
      mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.result:
        update result file
      mysql-test/suite/rpl/r/rpl_failed_optimize.result:
        update result file
      mysql-test/suite/rpl/r/rpl_filter_tables_not_exist.result:
        update result file
      mysql-test/suite/rpl/r/rpl_flushlog_loop.result:
        update result file
      mysql-test/suite/rpl/r/rpl_foreign_key_innodb.result:
        update result file
      mysql-test/suite/rpl/r/rpl_found_rows.result:
        update result file
      mysql-test/suite/rpl/r/rpl_free_items.result:
        update result file
      mysql-test/suite/rpl/r/rpl_geometry.result:
        update result file
      mysql-test/suite/rpl/r/rpl_get_lock.result:
        update result file
      mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result:
        update result file
      mysql-test/suite/rpl/r/rpl_grant.result:
        update result file
      mysql-test/suite/rpl/r/rpl_idempotency.result:
        update result file
      mysql-test/suite/rpl/r/rpl_ignore_grant.result:
        update result file
      mysql-test/suite/rpl/r/rpl_ignore_revoke.result:
        update result file
      mysql-test/suite/rpl/r/rpl_ignore_table.result:
        update result file
      mysql-test/suite/rpl/r/rpl_ignore_table_update.result:
        update result file
      mysql-test/suite/rpl/r/rpl_incident.result:
        update result file
      mysql-test/suite/rpl/r/rpl_init_slave.result:
        update result file
      mysql-test/suite/rpl/r/rpl_init_slave_errors.result:
        update result file
      mysql-test/suite/rpl/r/rpl_innodb.result:
        update result file
      mysql-test/suite/rpl/r/rpl_innodb_bug28430.result:
        update result file
      mysql-test/suite/rpl/r/rpl_innodb_bug30888.result:
        update result file
      mysql-test/suite/rpl/r/rpl_innodb_mixed_ddl.result:
        update result file
      mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result:
        update result file
      mysql-test/suite/rpl/r/rpl_insert.result:
        update result file
      mysql-test/suite/rpl/r/rpl_insert_id.result:
        update result file
      mysql-test/suite/rpl/r/rpl_insert_id_pk.result:
        update result file
      mysql-test/suite/rpl/r/rpl_insert_ignore.result:
        update result file
      mysql-test/suite/rpl/r/rpl_insert_select.result:
        update result file
      mysql-test/suite/rpl/r/rpl_invoked_features.result:
        update result file
      mysql-test/suite/rpl/r/rpl_killed_ddl.result:
        update result file
      mysql-test/suite/rpl/r/rpl_known_bugs_detection.result:
        update result file
      mysql-test/suite/rpl/r/rpl_load_from_master.result:
        update result file
      mysql-test/suite/rpl/r/rpl_load_table_from_master.result:
        update result file
      mysql-test/suite/rpl/r/rpl_loaddata.result:
        update result file
      mysql-test/suite/rpl/r/rpl_loaddata_charset.result:
        update result file
      mysql-test/suite/rpl/r/rpl_loaddata_concurrent.result:
        update result file
      mysql-test/suite/rpl/r/rpl_loaddata_fatal.result:
        update result file
      mysql-test/suite/rpl/r/rpl_loaddata_m.result:
        update result file
      mysql-test/suite/rpl/r/rpl_loaddata_map.result:
        update result file
      mysql-test/suite/rpl/r/rpl_loaddata_s.result:
        update result file
      mysql-test/suite/rpl/r/rpl_loaddata_simple.result:
        update result file
      mysql-test/suite/rpl/r/rpl_loaddata_symlink.result:
        update result file
      mysql-test/suite/rpl/r/rpl_loaddatalocal.result:
        update result file
      mysql-test/suite/rpl/r/rpl_loadfile.result:
        update result file
      mysql-test/suite/rpl/r/rpl_locale.result:
        update result file
      mysql-test/suite/rpl/r/rpl_log_pos.result:
        update result file
      mysql-test/suite/rpl/r/rpl_manual_change_index_file.result:
        update result file
      mysql-test/suite/rpl/r/rpl_many_optimize.result:
        update result file
      mysql-test/suite/rpl/r/rpl_master_pos_wait.result:
        update result file
      mysql-test/suite/rpl/r/rpl_misc_functions.result:
        update result file
      mysql-test/suite/rpl/r/rpl_mixed_bit_pk.result:
        update result file
      mysql-test/suite/rpl/r/rpl_mixed_ddl_dml.result:
        update result file
      mysql-test/suite/rpl/r/rpl_multi_delete.result:
        update result file
      mysql-test/suite/rpl/r/rpl_multi_delete2.result:
        update result file
      mysql-test/suite/rpl/r/rpl_multi_engine.result:
        update result file
      mysql-test/suite/rpl/r/rpl_multi_update.result:
        update result file
      mysql-test/suite/rpl/r/rpl_multi_update2.result:
        update result file
      mysql-test/suite/rpl/r/rpl_multi_update3.result:
        update result file
      mysql-test/suite/rpl/r/rpl_multi_update4.result:
        update result file
      mysql-test/suite/rpl/r/rpl_mysql_upgrade.result:
        update result file
      mysql-test/suite/rpl/r/rpl_name_const.result:
        update result file
      mysql-test/suite/rpl/r/rpl_nondeterministic_functions.result:
        update result file
      mysql-test/suite/rpl/r/rpl_not_null_innodb.result:
        update result file
      mysql-test/suite/rpl/r/rpl_not_null_myisam.result:
        update result file
      mysql-test/suite/rpl/r/rpl_optimize.result:
        update result file
      mysql-test/suite/rpl/r/rpl_packet.result:
        update result file
      mysql-test/suite/rpl/r/rpl_plugin_load.result:
        update result file
      mysql-test/suite/rpl/r/rpl_ps.result:
        update result file
      mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result:
        update result file
      mysql-test/suite/rpl/r/rpl_read_only.result:
        update result file
      mysql-test/suite/rpl/r/rpl_relay_space_innodb.result:
        update result file
      mysql-test/suite/rpl/r/rpl_relay_space_myisam.result:
        update result file
      mysql-test/suite/rpl/r/rpl_relayrotate.result:
        update result file
      mysql-test/suite/rpl/r/rpl_relayspace.result:
        update result file
      mysql-test/suite/rpl/r/rpl_replicate_do.result:
        update result file
      mysql-test/suite/rpl/r/rpl_replicate_ignore_db.result:
        update result file
      mysql-test/suite/rpl/r/rpl_report.result:
        update result file
      mysql-test/suite/rpl/r/rpl_rewrt_db.result:
        update result file
      mysql-test/suite/rpl/r/rpl_rotate_logs.result:
        update result file
      mysql-test/suite/rpl/r/rpl_row_001.result:
        update result file
      mysql-test/suite/rpl/r/rpl_row_4_bytes.result:
        update result file
      mysql-test/suite/rpl/r/rpl_row_NOW.result:
        update result file
      mysql-test/suite/rpl/r/rpl_row_USER.result:
        update result file
      mysql-test/suite/rpl/r/rpl_row_UUID.result:
        update result file
      mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result:
        update result file
      mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result:
        update result file
      mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result:
        update result file
      mysql-test/suite/rpl/r/rpl_row_basic_8partition.result:
        update result file
      mysql-test/suite/rpl/r/rpl_row_blob_innodb.result:
        update result file
      mysql-test/suite/rpl/r/rpl_row_blob_myisam.result:
        update result file
      mysql-test/suite/rpl/r/rpl_row_colSize.result:
        update result file
      mysql-test/suite/rpl/r/rpl_row_conflicts.result:
        update result file
      mysql-test/suite/rpl/r/rpl_row_delayed_ins.result:
        update result file
      mysql-test/suite/rpl/r/rpl_row_drop.result:
        update result file
      mysql-test/suite/rpl/r/rpl_row_find_row.result:
        update result file
      mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result:
        update result file
      mysql-test/suite/rpl/r/rpl_row_func001.result:
        update result file
      mysql-test/suite/rpl/r/rpl_row_func002.result:
        update result file
      mysql-test/suite/rpl/r/rpl_row_func003.result:
        update result file
      mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result:
        updated result file
      mysql-test/suite/rpl/r/rpl_row_insert_delayed.result:
        update result file
      mysql-test/suite/rpl/r/rpl_row_log.result:
        update result file
      mysql-test/suite/rpl/r/rpl_row_log_innodb.result:
        update result file
      mysql-test/suite/rpl/r/rpl_row_max_relay_size.result:
        update result file
      mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result:
        update result file
      mysql-test/suite/rpl/r/rpl_row_rec_comp_innodb.result:
        update result file
      mysql-test/suite/rpl/r/rpl_row_rec_comp_myisam.result:
        update result file
      mysql-test/suite/rpl/r/rpl_row_reset_slave.result:
        update result file
      mysql-test/suite/rpl/r/rpl_row_sp001.result:
        update result file
      mysql-test/suite/rpl/r/rpl_row_sp002_innodb.result:
        update result file
      mysql-test/suite/rpl/r/rpl_row_sp003.result:
        update result file
      mysql-test/suite/rpl/r/rpl_row_sp005.result:
        update result file
      mysql-test/suite/rpl/r/rpl_row_sp006_InnoDB.result:
        update result file
      mysql-test/suite/rpl/r/rpl_row_sp007_innodb.result:
        update result file
      mysql-test/suite/rpl/r/rpl_row_sp008.result:
        update result file
      mysql-test/suite/rpl/r/rpl_row_sp009.result:
        update result file
      mysql-test/suite/rpl/r/rpl_row_sp010.result:
        update result file
      mysql-test/suite/rpl/r/rpl_row_sp011.result:
        update result file
      mysql-test/suite/rpl/r/rpl_row_sp012.result:
        update result file
      mysql-test/suite/rpl/r/rpl_row_stop_middle_update.result:
        update result file
      mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
        update result file
      mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
        update result file
      mysql-test/suite/rpl/r/rpl_row_tbl_metadata.result:
        update result file
      mysql-test/suite/rpl/r/rpl_row_trig001.result:
        update result file
      mysql-test/suite/rpl/r/rpl_row_trig002.result:
        update result file
      mysql-test/suite/rpl/r/rpl_row_trig003.result:
        update result file
      mysql-test/suite/rpl/r/rpl_row_trig004.result:
        update result file
      mysql-test/suite/rpl/r/rpl_row_trunc_temp.result:
        update result file
      mysql-test/suite/rpl/r/rpl_row_unsafe_funcs.result:
        update result file
      mysql-test/suite/rpl/r/rpl_row_until.result:
        update result file
      mysql-test/suite/rpl/r/rpl_row_view01.result:
        update result file
      mysql-test/suite/rpl/r/rpl_row_wide_table.result:
        update result file
      mysql-test/suite/rpl/r/rpl_server_id1.result:
        update result file
      mysql-test/suite/rpl/r/rpl_server_id2.result:
        update result file
      mysql-test/suite/rpl/r/rpl_session_var.result:
        update result file
      mysql-test/suite/rpl/r/rpl_set_charset.result:
        update result file
      mysql-test/suite/rpl/r/rpl_set_null_innodb.result:
        update result file
      mysql-test/suite/rpl/r/rpl_set_null_myisam.result:
        update result file
      mysql-test/suite/rpl/r/rpl_show_slave_running.result:
        update result file
      mysql-test/suite/rpl/r/rpl_skip_error.result:
        update result file
      mysql-test/suite/rpl/r/rpl_slave_grp_exec.result:
        update result file
      mysql-test/suite/rpl/r/rpl_slave_load_in.result:
        update result file
      mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result:
        Updated result file
      mysql-test/suite/rpl/r/rpl_slave_load_tmpdir_not_exist.result:
        updated result file
      mysql-test/suite/rpl/r/rpl_slave_skip.result:
        update result file
      mysql-test/suite/rpl/r/rpl_slave_status.result:
        update result file
      mysql-test/suite/rpl/r/rpl_slow_query_log.result:
        update result file
      mysql-test/suite/rpl/r/rpl_sp.result:
        update result file
      mysql-test/suite/rpl/r/rpl_sp004.result:
        update result file
      mysql-test/suite/rpl/r/rpl_sp_effects.result:
        update result file
      mysql-test/suite/rpl/r/rpl_sporadic_master.result:
        update result file
      mysql-test/suite/rpl/r/rpl_ssl.result:
        update result file
      mysql-test/suite/rpl/r/rpl_ssl1.result:
        update result file
      mysql-test/suite/rpl/r/rpl_start_stop_slave.result:
        update result file
      mysql-test/suite/rpl/r/rpl_stm_000001.result:
        update result file
      mysql-test/suite/rpl/r/rpl_stm_EE_err2.result:
        updated result file
      mysql-test/suite/rpl/r/rpl_stm_auto_increment_bug33029.result:
        update result file
      mysql-test/suite/rpl/r/rpl_stm_binlog_direct.result:
        update result file
      mysql-test/suite/rpl/r/rpl_stm_conflicts.result:
        update result file
      mysql-test/suite/rpl/r/rpl_stm_create_if_not_exists.result:
        update result file
      mysql-test/suite/rpl/r/rpl_stm_flsh_tbls.result:
        update result file
      mysql-test/suite/rpl/r/rpl_stm_insert_delayed.result:
        update result file
      mysql-test/suite/rpl/r/rpl_stm_loadfile.result:
        update result file
      mysql-test/suite/rpl/r/rpl_stm_log.result:
        update result file
      mysql-test/suite/rpl/r/rpl_stm_max_relay_size.result:
        update result file
      mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result:
        update result file
      mysql-test/suite/rpl/r/rpl_stm_multi_query.result:
        update result file
      mysql-test/suite/rpl/r/rpl_stm_no_op.result:
        update result file
      mysql-test/suite/rpl/r/rpl_stm_reset_slave.result:
        update result file
      mysql-test/suite/rpl/r/rpl_stm_sql_mode.result:
        update result file
      mysql-test/suite/rpl/r/rpl_stm_until.result:
        update result file
      mysql-test/suite/rpl/r/rpl_stop_slave.result:
        update result file
      mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result:
        update result file
      mysql-test/suite/rpl/r/rpl_temp_table.result:
        update result file
      mysql-test/suite/rpl/r/rpl_temp_table_mix_row.result:
        update result file
      mysql-test/suite/rpl/r/rpl_temporary.result:
        update result file
      mysql-test/suite/rpl/r/rpl_temporary_errors.result:
        update result file
      mysql-test/suite/rpl/r/rpl_test_framework.result:
        updated result file
      mysql-test/suite/rpl/r/rpl_timezone.result:
        Updated result file
      mysql-test/suite/rpl/r/rpl_tmp_table_and_DDL.result:
        update result file
      mysql-test/suite/rpl/r/rpl_trigger.result:
        update result file
      mysql-test/suite/rpl/r/rpl_trunc_temp.result:
        update result file
      mysql-test/suite/rpl/r/rpl_truncate_2myisam.result:
        update result file
      mysql-test/suite/rpl/r/rpl_truncate_3innodb.result:
        update result file
      mysql-test/suite/rpl/r/rpl_typeconv_innodb.result:
        update result file
      mysql-test/suite/rpl/r/rpl_udf.result:
        update result file
      mysql-test/suite/rpl/r/rpl_user.result:
        update result file
      mysql-test/suite/rpl/r/rpl_user_variables.result:
        update result file
      mysql-test/suite/rpl/r/rpl_variables.result:
        update result file
      mysql-test/suite/rpl/r/rpl_variables_stm.result:
        update result file
      mysql-test/suite/rpl/r/rpl_view.result:
        update result file
      mysql-test/suite/rpl/t/rpl000017-slave.sh:
        Moved contents of -slave.sh into test.
      mysql-test/suite/rpl/t/rpl_000010-slave.opt:
        make all rpl tests use prefix rpl_
      mysql-test/suite/rpl/t/rpl_000010.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_000011.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_000013.test:
        Made test clean up replication state.
        Replaced save_master_pos/connection slave/sync_with_master
        by sync_slave_with_master.
      mysql-test/suite/rpl/t/rpl_000017-slave.opt:
        make all rpl tests use prefix rpl_
      mysql-test/suite/rpl/t/rpl_000017.test:
        Moved contents of -slave.sh into .test
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_EE_err.test:
        cosmetic fixes
      mysql-test/suite/rpl/t/rpl_LD_INFILE.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_alter.test:
        made test clean up after itself
        replaced rpl_diff_tables by diff_tables
        cosmetic fixes
      mysql-test/suite/rpl/t/rpl_alter_db.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_auto_increment.test:
        cosmetic fixes
      mysql-test/suite/rpl/t/rpl_auto_increment_11932.test:
        Made test clean up replication state.
        don't drop database twice
      mysql-test/suite/rpl/t/rpl_auto_increment_bug33029.test:
        - This test replicates, so moved it to rpl suite.
        - This test uses a fake relay log, so use
          include/setup_fake_relay_log.inc and cleanup_fake_relay_log.inc
          instead of ad-hoc code.
        - Made test clean up replication state (rpl_end.inc)
      mysql-test/suite/rpl/t/rpl_auto_increment_update_failure.test:
        - Made test clean up replication state.
        - diff_tables.inc now takes only one parameter.
      mysql-test/suite/rpl/t/rpl_begin_commit_rollback.test:
        renamed rpl_end.inc to master-slave-end.inc
      mysql-test/suite/rpl/t/rpl_binlog_corruption-master.opt:
        Got rid of useless -master.opt file.
      mysql-test/suite/rpl/t/rpl_binlog_corruption.test:
        Made test clean up replication state.
        Made test execute on slave connection instead of on master connection.
        This allows us to get rid of -master.opt file.
      mysql-test/suite/rpl/t/rpl_binlog_errors.test:
        made test use rpl_restart_server.inc instead of restart_mysqld.inc
      mysql-test/suite/rpl/t/rpl_binlog_grant.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_binlog_max_cache_size.test:
        - Made test clean up replication state.
        - replaced wait_for_slave_sql_to_stop.inc by
          wait_for_slave_sql_error_and_skip.inc
        - renamed diff_master_slave.inc to rpl_diff.inc and
          renamed $diff_statement to $rpl_diff_statement
      mysql-test/suite/rpl/t/rpl_bit.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_bit_npk.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_blackhole.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_bug26395.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_bug31076.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_bug33931.test:
        Made test clean up replication state.
        Made test use source include/master-slave.inc instead of
        ad-hoc setup.
      mysql-test/suite/rpl/t/rpl_bug38694.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_change_master.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_charset.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_charset_sjis.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.cnf:
        Use new names of mtr variables (introduced by the changes in
        include/circular_rpl_init.inc).
      mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test:
        - Use rpl_init.inc instead of circular_rpl_for_4_hosts.inc.
          Connections have been renamed (server_[1234] instead of master_[abcd]),
          we use rpl_sync.inc instead of circular_rpl_for_4_hosts_sync.inc,
          we use the new rpl_end.inc to clean up instead of doing it
          manually, and we use rpl_change_topology.inc instead of manual
          reconfiguration.
        - Added comment to make test understandable.
        - the test contained a race condition. server_4 was not sync'ed. This could
          cause sql_slave_skip_counter to have the value 1 when the test ended, so
          check-testcase would complain. Added 'sync_slave_with_master server_4'.
      mysql-test/suite/rpl/t/rpl_colSize.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_commit_after_flush.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_concurrency_error.test:
        - Made test clean up replication state.
        - renamed diff_master_slave.inc to rpl_diff.inc and
          renamed $diff_statement to $rpl_diff_statement
      mysql-test/suite/rpl/t/rpl_conditional_comments.test:
        made test clean up after itself
        new protocol for diff_tables.inc
      mysql-test/suite/rpl/t/rpl_create_database.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_create_if_not_exists.test:
        renamed master-slave-end.inc to rpl_end.inc
      mysql-test/suite/rpl/t/rpl_create_tmp_table_if_not_exists.test:
        renamed master-slave-end.inc to rpl_end.inc
      mysql-test/suite/rpl/t/rpl_critical_errors.test:
        Made test clean up replication state.
        Fixed syntax error in test.
      mysql-test/suite/rpl/t/rpl_cross_version.test:
        Made test clean up replication state.
        Made test execute on slave connection instead of on master connection.
        This allows us to get rid of -master.opt file.
      mysql-test/suite/rpl/t/rpl_current_user.cnf:
        use environment variables recognized by rpl_init.inc
      mysql-test/suite/rpl/t/rpl_current_user.test:
        - Use rpl_init.inc instead of ad-hoc three-server setup.
          Hence, rename connection slave2 to server_3
        - don't drop lots of things at the beginning of the test
        - rpl_diff_tables.inc does not sync any more, so we have to
          sync here instead
        - renamed $diff_table to $rpl_diff_table and $diff_table_list
          to $rpl_diff_table_list
        - use diff_tables.inc instead of rpl_diff_tables.inc
      mysql-test/suite/rpl/t/rpl_ddl.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_deadlock_innodb.test:
        cosmetic fixes
      mysql-test/suite/rpl/t/rpl_delete_no_where.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_do_grant.test:
        Made test clean up replication state.
        renamed master-slave-end.inc to rpl_end.inc
        use include/check_slave_no_error.inc instead of ad-hoc construction
      mysql-test/suite/rpl/t/rpl_drop.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_drop_db.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_drop_temp.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_drop_view.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_dual_pos_advance.test:
        Made test use the new framework for circular replication,
        instead of ad-hoc setup.
      mysql-test/suite/rpl/t/rpl_empty_master_crash.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_err_ignoredtable.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_events.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_extra_col_master_innodb.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_extra_col_master_myisam.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_extra_col_slave_innodb.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_extra_col_slave_myisam.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_failed_optimize.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_filter_tables_not_exist.test:
        renamed master-slave-end.inc to rpl_end.inc
      mysql-test/suite/rpl/t/rpl_flushlog_loop-master.opt:
        Removed useless options from -master.opt file.
      mysql-test/suite/rpl/t/rpl_flushlog_loop-master.sh:
        Removed useless -master.sh file
      mysql-test/suite/rpl/t/rpl_flushlog_loop-slave.opt:
        Removed useless options from -slave.opt file
      mysql-test/suite/rpl/t/rpl_flushlog_loop-slave.sh:
        Removed useless -slave.sh file
      mysql-test/suite/rpl/t/rpl_flushlog_loop.test:
        Made test use new framework for circular replication,
        instead of ad-hoc setup.
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_foreign_key_innodb.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_found_rows.test:
        Made test clean up replication state.
        replaced reset_master_and_slave.inc by rpl_reset.inc
      mysql-test/suite/rpl/t/rpl_free_items.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_geometry.test:
        replaced master-slave-end.inc by rpl_end.inc
      mysql-test/suite/rpl/t/rpl_get_lock.test:
        Made test clean up replication state.
        Replaced save_master_pos+connection slave+sync_with_master
        by sync_slave_with_master.
      mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test:
        Made test clean up replication state.
        Removed last part of test, because it was verbatim identical to
        rpl_server_id1.test
      mysql-test/suite/rpl/t/rpl_grant.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_idempotency.test:
        use check_slave_no_error.inc instead of ad-hoc tests
        use wait_for_slave_sql_error.inc instead of wait_for_slave_to_stop.inc
        replace master-slave-end.inc by rpl_end.inc
      mysql-test/suite/rpl/t/rpl_ignore_grant.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_ignore_revoke.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_ignore_table.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_ignore_table_update.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_incident.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_init_slave.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_init_slave_errors.test:
        Made test clean up replication state.
        Also replaced call to wait_for_slave_sql_to_stop.inc by
        call to wait_for_slave_sql_error.inc
      mysql-test/suite/rpl/t/rpl_innodb.test:
        replace master-slave-end.inc by rpl_end.inc
      mysql-test/suite/rpl/t/rpl_innodb_bug28430.test:
        replace master-slave-end.inc by rpl_end.inc
      mysql-test/suite/rpl/t/rpl_innodb_bug30888.test:
        replace master-slave-end.inc by rpl_end.inc
      mysql-test/suite/rpl/t/rpl_innodb_mixed_ddl.test:
        cosmetic fixes
      mysql-test/suite/rpl/t/rpl_innodb_mixed_dml.test:
        cosmetic fixes
      mysql-test/suite/rpl/t/rpl_insert.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_insert_id.test:
        cosmetic fixes
      mysql-test/suite/rpl/t/rpl_insert_id_pk.test:
        cosmetic fixes
      mysql-test/suite/rpl/t/rpl_insert_ignore.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_insert_select.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_invoked_features.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_killed_ddl.test:
        - Made test clean up replication state.
        - renamed diff_master_slave.inc to rpl_diff.inc and
          renamed $diff_statement to $rpl_diff_statement
      mysql-test/suite/rpl/t/rpl_known_bugs_detection.test:
        - Made test clean up replication state.
        - removed wait_for_slave_sql_to_stop.inc, because it already does
          wait_for_slave_sql_error.inc
      mysql-test/suite/rpl/t/rpl_load_from_master.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_load_table_from_master.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_loaddata.test:
        cosmetic fixes
      mysql-test/suite/rpl/t/rpl_loaddata_charset.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_loaddata_fatal.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_loaddata_m.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_loaddata_map.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_loaddata_s.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_loaddata_simple.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_loaddata_symlink.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_loaddatalocal.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_loadfile.test:
        - Made test clean up replication state.
        - replace reset_master_and_slave.inc by rpl_reset.inc
        - diff_tables.inc now takes only one parameter.
        - diff_tables.inc also restores the connection to what it was before,
          so in this test we have to manually change connection
          after sourcing diff_tables.inc
      mysql-test/suite/rpl/t/rpl_locale.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_log_pos.test:
        Made test clean up replication state.
        replace stop_slave.inc by stop_slave_sql.inc since the io thread
        is already stopped.
      mysql-test/suite/rpl/t/rpl_manual_change_index_file.test:
        use wait_for_slave_io_error.inc instead of wait_for_slave_to_stop.inc
        replace master-slave-end.inc by rpl_end.inc
      mysql-test/suite/rpl/t/rpl_many_optimize.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_master_pos_wait.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_misc_functions.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_mixed_bit_pk.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_mixed_ddl_dml.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_multi_delete.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_multi_delete2.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_multi_engine.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_multi_update.test:
        cosmetic fixes
      mysql-test/suite/rpl/t/rpl_multi_update2.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_multi_update3.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_multi_update4.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_mysql_upgrade.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_name_const.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_nondeterministic_functions.test:
        - Made test clean up replication state.
        - diff_tables.inc now takes only one parameter.
        - diff_tables.inc also restores the connection to what it was before,
          so in this test we have to manually change connection
          after sourcing diff_tables.inc
      mysql-test/suite/rpl/t/rpl_not_null_innodb.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_not_null_myisam.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_optimize.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_packet.test:
        - Made test clean up replication state.
        - replace wait_for_slave_io_to_stop.inc by wait_for_slave_io_error.inc
        - replace master-slave-reset.inc by rpl_reset.inc + drop table t1.
        - replaced save_master_pos/connection slave/sync_with_master
          by sync_slave_with_master.
        - added comment explaining why we need stop_slave_sql.inc
          (we shouldn't need it, it's a bug)
      mysql-test/suite/rpl/t/rpl_plugin_load.test:
        replace master-slave-end.inc by rpl_end.inc
      mysql-test/suite/rpl/t/rpl_ps.test:
        Made test clean up replication state.
        removed lots os useless junk
      mysql-test/suite/rpl/t/rpl_rbr_to_sbr.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_read_only.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_relay_space_innodb.test:
        cosmetic fixes
      mysql-test/suite/rpl/t/rpl_relay_space_myisam.test:
        cosmetic fixes
      mysql-test/suite/rpl/t/rpl_relayrotate.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_relayspace.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_replicate_do.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_replicate_ignore_db.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_report.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_rewrt_db.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_rotate_logs-slave.opt:
        Got rid of unnecessary -slave.opt file
      mysql-test/suite/rpl/t/rpl_rotate_logs-slave.sh:
        Got rid of unnecessary -slave.sh file
      mysql-test/suite/rpl/t/rpl_rotate_logs.test:
        - Made test clean up replication state.
        - replaced wait_for_slave_sql_to_stop.inc by
          wait_for_slave_sql_error_and_skip.inc
        - removed useless cleanup at beginning of test
        - did not make test use the standard replication framework
          (master-slave.inc + rpl_end.inc), because it won't work. i don't
          know why.
      mysql-test/suite/rpl/t/rpl_row_001.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_row_4_bytes.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_row_NOW.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_row_USER.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_row_UUID.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test:
        Made test clean up replication state.
        Removed unnecessary 'set binlog_format'.
        replaced master-slave-reset.inc by rpl_reset.inc
      mysql-test/suite/rpl/t/rpl_row_basic_2myisam.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_row_basic_3innodb.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_row_basic_8partition.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_row_blob_innodb.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_row_blob_myisam.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_row_colSize.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_row_conflicts.test:
        replace master-slave-end.inc by rpl_end.inc
      mysql-test/suite/rpl/t/rpl_row_create_table.test:
        replace master-slave-end.inc by rpl_end.inc
        replace master-slave-reset.inc by rpl_reset.inc
        replace long sequence of reset master+reset slave by rpl_reset.inc
      mysql-test/suite/rpl/t/rpl_row_delayed_ins.test:
        cosmetic fixes
      mysql-test/suite/rpl/t/rpl_row_drop.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_row_find_row.test:
        - Made test clean up replication state.
        - replace master-slave-reset.inc by rpl_reset.inc
        - diff_tables.inc now takes only one parameter.
      mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test:
        cosmetic fixes
      mysql-test/suite/rpl/t/rpl_row_func001.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_row_func002.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_row_func003.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_row_inexist_tbl.test:
        Made test clean up replication state.
        replace wait_for_slave_sql_to_stop.inc by wait_for_slave_sql_error.inc
      mysql-test/suite/rpl/t/rpl_row_insert_delayed.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_row_log.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_row_log_innodb.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_row_rec_comp_innodb.test:
        Made test clean up replication state
      mysql-test/suite/rpl/t/rpl_row_rec_comp_myisam.test:
        - replace master-slave-reset.inc by rpl_reset.inc
        - Made test clean up replication state
        - diff_tables.inc now takes only one parameter.
      mysql-test/suite/rpl/t/rpl_row_sp001.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_row_sp002_innodb.test:
        cosmetic fixes
      mysql-test/suite/rpl/t/rpl_row_sp003.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_row_sp005.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_row_sp006_InnoDB.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_row_sp007_innodb.test:
        cosmetic fixes
      mysql-test/suite/rpl/t/rpl_row_sp008.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_row_sp009.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_row_sp010.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_row_sp011.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_row_sp012.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_row_stop_middle_update.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_row_tabledefs_2myisam.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_row_tabledefs_3innodb.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_row_tbl_metadata.test:
        - replaced master-slave-reset.inc by rpl_reset.inc
        - replaced master-slave-end.inc by rpl_end.inc
        - diff_tables.inc now takes only one parameter.
      mysql-test/suite/rpl/t/rpl_row_trig001.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_row_trig002.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_row_trig003.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_row_trig004.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_row_trunc_temp.test:
        replaced master-slave-end.inc by rpl_end.inc
      mysql-test/suite/rpl/t/rpl_row_unsafe_funcs.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_row_until.test:
        Made test clean up replication state.
        Removed unused mtr variable $VERSION.
      mysql-test/suite/rpl/t/rpl_row_view01.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_row_wide_table.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_server_id1.test:
        - Replaced ad-hoc setup of circular replication by call to rpl_init.inc
        - Made test clean up replication state.
        - Replaced ad-hoc use of wait_for_slave_param.inc by
          wait_for_slave_io_error.inc
      mysql-test/suite/rpl/t/rpl_server_id2.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_session_var.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_set_charset.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_set_null_innodb.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_set_null_myisam.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_show_slave_running.test:
        made test clean up replication state
      mysql-test/suite/rpl/t/rpl_skip_error.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_slave_grp_exec.test:
        - Made test clean up replication state.
        - replaced wait_for_slave_sql_to_stop.inc by wait_for_slave_sql_error.inc
        - replaced stop_slave.inc by stop_slave_io.inc where the sql thread
          was already stopped.
      mysql-test/suite/rpl/t/rpl_slave_load_in.test:
        - Made test clean up replication state.
        - diff_tables.inc now takes only one parameter.
      mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_slave_load_tmpdir_not_exist.test:
        - Made test clean up replication state.
        - Replaced call to wait_for_slave_sql_to_stop.inc by call to
          wait_for_slave_sql_error.inc
        - Replaced ad-hoc repliction setup by call to master-slave.inc
      mysql-test/suite/rpl/t/rpl_slave_skip.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_slave_status.test:
        Made test clean up replication state.
        replaced check that IO thread has stopped by wait_for_slave_io_error.inc
        simplified cleanup code
      mysql-test/suite/rpl/t/rpl_slow_query_log.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_sp.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_sp004.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_sp_effects.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_sporadic_master.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_ssl.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_ssl1.test:
        Made test clean up replication state.
        Replaced save_master_pos+connection slave+sync_slave_with_master
        by sync_slave_with_master
      mysql-test/suite/rpl/t/rpl_start_stop_slave.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_stm_000001.test:
        The include file extra/rpl_tests/rpl_stm_000001.test was only
        sourced once, in suite/rpl/t/rpl_stm_000001.test.
        Moved extra/rpl_tests/rpl_stm_000001.test to
        suite/rpl/t/rpl_stm_000001.test and removed the old
        suite/rpl/t/rpl_stm_000001.test.
        Also made test clean up replication state, and replaced
        wait_for_slave_sql_to_stop.inc by wait_for_slave_sql_error_and_skip.inc
      mysql-test/suite/rpl/t/rpl_stm_000001.test:
        - The include file extra/rpl_tests/rpl_stm_000001.test was only
          sourced once, in suite/rpl/t/rpl_stm_000001.test.
          Moved extra/rpl_tests/rpl_stm_000001.test to
          suite/rpl/t/rpl_stm_000001.test and removed the old
          suite/rpl/t/rpl_stm_000001.test.
      mysql-test/suite/rpl/t/rpl_stm_auto_increment_bug33029.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_stm_binlog_direct.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_stm_conflicts.test:
        replaced master-slave-end.inc by rpl_end.inc
        cosmetic fixes
      mysql-test/suite/rpl/t/rpl_stm_create_if_not_exists.test:
        use rpl_end instead of master-slave-end.
      mysql-test/suite/rpl/t/rpl_stm_flsh_tbls.test:
        cosmetic fixes
      mysql-test/suite/rpl/t/rpl_stm_insert_delayed.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_stm_loadfile.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_stm_log.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_stm_max_relay_size.test:
        cosmetic fixes
      mysql-test/suite/rpl/t/rpl_stm_mixing_engines.test:
        - replaced master-slave-end.inc by rpl_end.inc
        - replaced master-slave-reset.inc by rpl_reset.inc
        - diff_tables.inc now takes only one parameter.
      mysql-test/suite/rpl/t/rpl_stm_multi_query.test:
        cosmetic fixes
      mysql-test/suite/rpl/t/rpl_stm_no_op.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_stm_sql_mode.test:
        made test clean up replication state
      mysql-test/suite/rpl/t/rpl_stm_until.test:
        - Made test clean up replication state.
        - replaced master-slave-reset.inc by rpl_reset.inc
        - the relay log is now called slave-relay-bin.000003 instead of .000004,
          because master-slave.inc doesn't rotate it as much as before.
      mysql-test/suite/rpl/t/rpl_stop_slave.test:
        use rpl_end instead of master-slav-end
      mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_temp_table.test:
        Made test clean up replication state.
        Replaced save_master_pos/connection slave/sync_with_master
        by sync_slave_with_master.
      mysql-test/suite/rpl/t/rpl_temp_table_mix_row.test:
        Made test clean up replication state.
        replaced ad-hoc call to 'connect' by include/rpl_connect.inc
        replaced master-slave-reset.inc by rpl_reset.inc
      mysql-test/suite/rpl/t/rpl_temporary.test:
        - Made test clean up replication state.
        - This test sources include/delete_anonymous_users.inc on master.
          This means it updates the user table in the mysql database manually
          on the master. This causes failure in the slave sql thread when
          binlog_format=row. Hence, we stop the slave first and source
          include/delete_anonymous_users.inc on both master and slave.
      mysql-test/suite/rpl/t/rpl_temporary_errors.test:
        Made test clean up replication state.
        cosmetic fixes
      mysql-test/suite/rpl/t/rpl_test_framework.cnf:
        new cfg file for new test
      mysql-test/suite/rpl/t/rpl_test_framework.test:
        new test case that verifies that include/rpl_change_topology.inc
        works
      mysql-test/suite/rpl/t/rpl_timezone.test:
        - Made test clean up replication state.
        - stop slave before last sub-test, because that test does not use
          the slave connection.
      mysql-test/suite/rpl/t/rpl_tmp_table_and_DDL.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_trigger.test:
        - Made test clean up replication state.
        - replace master-slave-reset.inc by rpl_reset.inc
        - use new file rpl_reconnect.inc instead of ad-hoc code
        - diff_tables.inc now takes only one parameter.
      mysql-test/suite/rpl/t/rpl_trunc_temp.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_truncate_2myisam.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_truncate_3innodb.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_typeconv_innodb.test:
        - made test clean up replication state
        - removed unnecessary call to master-slave-reset.inc
        - diff_tables.inc now takes only one parameter.
      mysql-test/suite/rpl/t/rpl_udf.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_user.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_user_variables.test:
        Made test clean up replication state.
      mysql-test/suite/rpl/t/rpl_variables.test:
        - Made test clean up replication state.
        - replaced reset_master_and_slave.inc by rpl_reset.inc
        - diff_tables.inc now takes only one parameter.
      mysql-test/suite/rpl/t/rpl_variables_stm.test:
        - Made test clean up replication state.
        - diff_tables.inc now takes only one parameter.
      mysql-test/suite/rpl/t/rpl_view.test:
        Made test clean up replication state.
      mysql-test/suite/rpl_ndb/r/rpl_ndb_2other.result:
        updated result file
      mysql-test/suite/rpl_ndb/r/rpl_ndb_UUID.result:
        updated result file
      mysql-test/suite/rpl_ndb/r/rpl_ndb_apply_status.result:
        updated result file
      mysql-test/suite/rpl_ndb/r/rpl_ndb_auto_inc.result:
        updated result file
      mysql-test/suite/rpl_ndb/r/rpl_ndb_basic.result:
        updated result file
      mysql-test/suite/rpl_ndb/r/rpl_ndb_blob.result:
        updated result file
      mysql-test/suite/rpl_ndb/r/rpl_ndb_blob2.result:
        updated result file
      mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result:
        updated result file
      mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_2ch.result:
        updated result file
      mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result:
        updated result file
      mysql-test/suite/rpl_ndb/r/rpl_ndb_commit_afterflush.result:
        updated result file
      mysql-test/suite/rpl_ndb/r/rpl_ndb_ctype_ucs2_def.result:
        updated result file
      mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_basic.result:
        updated result file
      mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_partitions.result:
        updated result file
      mysql-test/suite/rpl_ndb/r/rpl_ndb_ddl.result:
        updated result file
      mysql-test/suite/rpl_ndb/r/rpl_ndb_delete_nowhere.result:
        updated result file
      mysql-test/suite/rpl_ndb/r/rpl_ndb_do_db.result:
        updated result file
      mysql-test/suite/rpl_ndb/r/rpl_ndb_do_table.result:
        updated result file
      mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result:
        updated result file
      mysql-test/suite/rpl_ndb/r/rpl_ndb_func003.result:
        updated result file
      mysql-test/suite/rpl_ndb/r/rpl_ndb_idempotent.result:
        updated result file
      mysql-test/suite/rpl_ndb/r/rpl_ndb_innodb2ndb.result:
        updated result file
      mysql-test/suite/rpl_ndb/r/rpl_ndb_innodb_trans.result:
        updated result file
      mysql-test/suite/rpl_ndb/r/rpl_ndb_insert_ignore.result:
        updated result file
      mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result:
        updated result file
      mysql-test/suite/rpl_ndb/r/rpl_ndb_mixed_engines_transactions.result:
        updated result file
      mysql-test/suite/rpl_ndb/r/rpl_ndb_mixed_tables.result:
        updated result file
      mysql-test/suite/rpl_ndb/r/rpl_ndb_multi.result:
        updated result file
      mysql-test/suite/rpl_ndb/r/rpl_ndb_multi_update2.result:
        updated result file
      mysql-test/suite/rpl_ndb/r/rpl_ndb_multi_update3.result:
        updated result file
      mysql-test/suite/rpl_ndb/r/rpl_ndb_myisam2ndb.result:
        updated result file
      mysql-test/suite/rpl_ndb/r/rpl_ndb_rep_ignore.result:
        updated result file
      mysql-test/suite/rpl_ndb/r/rpl_ndb_row_001.result:
        updated result file
      mysql-test/suite/rpl_ndb/r/rpl_ndb_set_null.result:
        updated result file
      mysql-test/suite/rpl_ndb/r/rpl_ndb_sp003.result:
        updated result file
      mysql-test/suite/rpl_ndb/r/rpl_ndb_sp006.result:
        updated result file
      mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result:
        updated result file
      mysql-test/suite/rpl_ndb/r/rpl_ndb_sync.result:
        updated result file
      mysql-test/suite/rpl_ndb/r/rpl_ndb_trig004.result:
        updated result file
      mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result:
        updated result file
      mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb.result:
        updated result file
      mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb.test:
        made test clean up replication state
      mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam.test:
        made test clean up replication state
      mysql-test/suite/rpl_ndb/t/rpl_ndb_2ndb.test:
        made test clean up replication state
      mysql-test/suite/rpl_ndb/t/rpl_ndb_2other.test:
        made test clean up replication state
      mysql-test/suite/rpl_ndb/t/rpl_ndb_UUID.test:
        made test clean up replication state
      mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status.test:
        made test clean up replication state
      mysql-test/suite/rpl_ndb/t/rpl_ndb_auto_inc.test:
        made test clean up replication state
      mysql-test/suite/rpl_ndb/t/rpl_ndb_bank.test:
        made test clean up replication state
      mysql-test/suite/rpl_ndb/t/rpl_ndb_basic.test:
        - replaced master-slave-end.inc by rpl_end.inc
        - removed wait_for_slave_sql_to_stop since it is followed by
          wait_for_slave_sql_error.inc
      mysql-test/suite/rpl_ndb/t/rpl_ndb_blob.test:
        made test clean up replication state
      mysql-test/suite/rpl_ndb/t/rpl_ndb_blob2.test:
        made test clean up replication state
      mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test:
        made test use rpl_init.inc to setup circular replication, instead of ad-hoc setup
        made test clean up replication state
      mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.cnf:
        removed automatic configuration of server as slave. this is not
        needed because rpl_init.inc does it.
      mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test:
        - made test clean up replication state
        - it seems that sync_slave_with_master does not work deterministically
          here, so instead we wait for 'drop table' to replicate by checking
          when the table disappears on slave.
        - diff_tables.inc now takes only one parameter.
      mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test:
        make test clean up replication state
        use rpl_change_topology.inc to reconfigure replication topology,
        instead of ad-hoc call to change master
      mysql-test/suite/rpl_ndb/t/rpl_ndb_commit_afterflush.test:
        make test clean up replication state
      mysql-test/suite/rpl_ndb/t/rpl_ndb_ctype_ucs2_def.test:
        make test clean up replication state
      mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_basic.test:
        replace master-slave-end.inc by rpl_end.inc
      mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions.test:
        make test clean up replication state
      mysql-test/suite/rpl_ndb/t/rpl_ndb_ddl.test:
        make test clean up replication state
      mysql-test/suite/rpl_ndb/t/rpl_ndb_delete_nowhere.test:
        make test clean up replication state
      mysql-test/suite/rpl_ndb/t/rpl_ndb_do_db.test:
        make test clean up replication state
      mysql-test/suite/rpl_ndb/t/rpl_ndb_do_table.test:
        make test clean up replication state
      mysql-test/suite/rpl_ndb/t/rpl_ndb_extraCol.test:
        make test clean up replication state
      mysql-test/suite/rpl_ndb/t/rpl_ndb_func003.test:
        replace master-slave-end.inc by rpl_end.inc
      mysql-test/suite/rpl_ndb/t/rpl_ndb_idempotent.test:
        replace master-slave-end.inc by rpl_end.inc
      mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb.test:
        make test clean up replication state
      mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb_trans.test:
        make test clean up replication state
      mysql-test/suite/rpl_ndb/t/rpl_ndb_insert_ignore.test:
        make test clean up replication state
      mysql-test/suite/rpl_ndb/t/rpl_ndb_load.test:
        make test clean up replication state
      mysql-test/suite/rpl_ndb/t/rpl_ndb_log.test:
        make test clean up replication state
      mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_engines_transactions.test:
        - replace master-slave-end.inc by rpl_end.inc
        - diff_tables.inc now takes only one parameter.
      mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_tables.test:
        - make test clean up replication state
        - diff_tables.inc now takes only one parameter.
      mysql-test/suite/rpl_ndb/t/rpl_ndb_multi.test:
        - make test clean up replication state
        - use rpl_change_topology.inc to change replication topology,
          instead of ad-hoc calls to change master
      mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update2.test:
        make test clean up replication state
      mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update3.test:
        make test clean up replication state
      mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb.test:
        make test clean up replication state
      mysql-test/suite/rpl_ndb/t/rpl_ndb_relayrotate.test:
        make test clean up replication state
      mysql-test/suite/rpl_ndb/t/rpl_ndb_rep_ignore.test:
        make test clean up replication state
      mysql-test/suite/rpl_ndb/t/rpl_ndb_row_001.test:
        make test clean up replication state
      mysql-test/suite/rpl_ndb/t/rpl_ndb_set_null.test:
        make test clean up replication state
      mysql-test/suite/rpl_ndb/t/rpl_ndb_sp003.test:
        make test clean up replication state
      mysql-test/suite/rpl_ndb/t/rpl_ndb_sp006.test:
        make test clean up replication state
      mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb.test:
        make test clean up replication state
      mysql-test/suite/rpl_ndb/t/rpl_ndb_sync.test:
        make test clean up replication state
      mysql-test/suite/rpl_ndb/t/rpl_ndb_trig004.test:
        make test clean up replication state
      mysql-test/suite/rpl_ndb/t/rpl_ndbapi_multi.test:
        make test clean up replication state
      mysql-test/suite/rpl_ndb/t/rpl_row_basic_7ndb.test:
        replace master-slave-end.inc by rpl_end.inc
      mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb.test:
        replace master-slave-end.inc by rpl_end.inc
      mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2.test:
        make test clean up replication state
      mysql-test/suite/sys_vars/t/rpl_init_slave_func.test:
        made test clean up after itself
      mysql-test/t/init_file.test:
        use new file force_restart.inc instead of SP
      8b27f9a0
    • Sven Sandberg's avatar
      BUG#49978: Replication tests don't clean up replication state at the end · 09c80e12
      Sven Sandberg authored
      Major replication test framework cleanup. This does the following:
       - Ensure that all tests clean up the replication state when they
         finish, by making check-testcase check the output of SHOW SLAVE STATUS.
         This implies:
          - Slave must not be running after test finished. This is good
            because it removes the risk for sporadic errors in subsequent
            tests when a test forgets to sync correctly.
          - Slave SQL and IO errors must be cleared when test ends. This is
            good because we will notice if a test gets an unexpected error in
            the slave threads near the end.
          - We no longer have to clean up before a test starts.
       - Ensure that all tests that wait for an error in one of the slave
         threads waits for a specific error. It is no longer possible to
         source wait_for_slave_[sql|io]_to_stop.inc when there is an error
         in one of the slave threads. This is good because:
          - If a test expects an error but there is a bug that causes
            another error to happen, or if it stops the slave thread without
            an error, then we will notice.
          - When developing tests, wait_for_*_to_[start|stop].inc will fail
            immediately if there is an error in the relevant slave thread.
            Before this patch, we had to wait for the timeout.
       - Remove duplicated and repeated code for setting up unusual replication
         topologies. Now, there is a single file that is capable of setting
         up arbitrary topologies (include/rpl_init.inc, but
         include/master-slave.inc is still available for the most common
         topology). Tests can now end with include/rpl_end.inc, which will clean
         up correctly no matter what topology is used. The topology can be
         changed with include/rpl_change_topology.inc.
       - Improved debug information when tests fail. This includes:
          - debug info is printed on all servers configured by include/rpl_init.inc
          - User can set $rpl_debug=1, which makes auxiliary replication files
            print relevant debug info.
       - Improved documentation for all auxiliary replication files. Now they
         describe purpose, usage, parameters, and side effects.
       - Many small code cleanups:
          - Made have_innodb.inc output a sensible error message.
          - Moved contents of rpl000017-slave.sh into rpl000017.test
          - Added mysqltest variables that expose the current state of
            disable_warnings/enable_warnings and friends.
          - Too many to list here: see per-file comments for details.
      09c80e12
  3. 27 Nov, 2009 2 commits
  4. 27 Jun, 2007 2 commits
    • unknown's avatar
      WL#3933 Split main test suite to rpl, rpl_ndb and ndb · a40e44ef
      unknown authored
       - Update mysql-test-run.pl to collect tests from several suites
       - Group test into suites
       - Add suite.opt file
      
      
      mysql-test/suite/ndb/r/ndb_multi.result:
        Rename: mysql-test/r/ndb_multi.result -> mysql-test/suite/ndb/r/ndb_multi.result
      mysql-test/suite/rpl/t/rpl_replicate_ignore_db.test:
        Rename: mysql-test/t/rpl_replicate_ignore_db.test -> mysql-test/suite/rpl/t/rpl_replicate_ignore_db.test
      mysql-test/suite/rpl/t/rpl_row_trig001.test:
        Rename: mysql-test/t/rpl_row_trig001.test -> mysql-test/suite/rpl/t/rpl_row_trig001.test
      mysql-test/suite/rpl_ndb/r/rpl_ndb_sp003.result:
        Rename: mysql-test/r/rpl_ndb_sp003.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_sp003.result
      mysql-test/suite/binlog/r/binlog_stm_insert_select.result:
        Rename: mysql-test/r/binlog_stm_insert_select.result -> mysql-test/suite/binlog/r/binlog_stm_insert_select.result
      mysql-test/suite/ndb/t/ndb_condition_pushdown.test:
        Rename: mysql-test/t/ndb_condition_pushdown.test -> mysql-test/suite/ndb/t/ndb_condition_pushdown.test
      mysql-test/suite/ndb/t/ndb_dd_dump.test:
        Rename: mysql-test/t/ndb_dd_dump.test -> mysql-test/suite/ndb/t/ndb_dd_dump.test
      mysql-test/suite/ndb/t/ndb_partition_range.test:
        Rename: mysql-test/t/ndb_partition_range.test -> mysql-test/suite/ndb/t/ndb_partition_range.test
      mysql-test/suite/ndb/t/strict_autoinc_5ndb.test:
        Rename: mysql-test/t/strict_autoinc_5ndb.test -> mysql-test/suite/ndb/t/strict_autoinc_5ndb.test
      mysql-test/suite/rpl/r/rpl_commit_after_flush.result:
        Rename: mysql-test/r/rpl_commit_after_flush.result -> mysql-test/suite/rpl/r/rpl_commit_after_flush.result
      mysql-test/suite/rpl/r/rpl_view.result:
        Rename: mysql-test/r/rpl_view.result -> mysql-test/suite/rpl/r/rpl_view.result
      mysql-test/suite/rpl/t/rpl_insert_select.test:
        Rename: mysql-test/t/rpl_insert_select.test -> mysql-test/suite/rpl/t/rpl_insert_select.test
      mysql-test/suite/rpl/t/rpl_load_from_master-slave.opt:
        Rename: mysql-test/t/rpl_load_from_master-slave.opt -> mysql-test/suite/rpl/t/rpl_load_from_master-slave.opt
      mysql-test/suite/rpl/t/rpl_many_optimize.test:
        Rename: mysql-test/t/rpl_many_optimize.test -> mysql-test/suite/rpl/t/rpl_many_optimize.test
      mysql-test/suite/rpl/t/rpl_mixed_ddl_dml.test:
        Rename: mysql-test/t/rpl_mixed_ddl_dml.test -> mysql-test/suite/rpl/t/rpl_mixed_ddl_dml.test
      mysql-test/suite/rpl/t/rpl_multi_delete.test:
        Rename: mysql-test/t/rpl_multi_delete.test -> mysql-test/suite/rpl/t/rpl_multi_delete.test
      mysql-test/suite/rpl/t/rpl_row_log_innodb.test:
        Rename: mysql-test/t/rpl_row_log_innodb.test -> mysql-test/suite/rpl/t/rpl_row_log_innodb.test
      mysql-test/suite/rpl/t/rpl_row_reset_slave.test:
        Rename: mysql-test/t/rpl_row_reset_slave.test -> mysql-test/suite/rpl/t/rpl_row_reset_slave.test
      mysql-test/suite/rpl/t/rpl_row_stop_middle.test:
        Rename: mysql-test/t/rpl_row_stop_middle.test -> mysql-test/suite/rpl/t/rpl_row_stop_middle.test
      mysql-test/suite/rpl/t/rpl_stm_log-master.opt:
        Rename: mysql-test/t/rpl_stm_log-master.opt -> mysql-test/suite/rpl/t/rpl_stm_log-master.opt
      mysql-test/suite/rpl_ndb/r/rpl_ndb_delete_nowhere.result:
        Rename: mysql-test/r/rpl_ndb_delete_nowhere.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_delete_nowhere.result
      mysql-test/suite/rpl_ndb/t/rpl_ndb_sync.test:
        Rename: mysql-test/t/rpl_ndb_sync.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_sync.test
      mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result:
        Rename: mysql-test/r/binlog_row_mix_innodb_myisam.result -> mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
      mysql-test/suite/ndb/r/ndb_dd_alter.result:
        Rename: mysql-test/r/ndb_dd_alter.result -> mysql-test/suite/ndb/r/ndb_dd_alter.result
      mysql-test/suite/ndb/r/ndb_index_unique.result:
        Rename: mysql-test/r/ndb_index_unique.result -> mysql-test/suite/ndb/r/ndb_index_unique.result
      mysql-test/suite/ndb/r/ndb_rename.result:
        Rename: mysql-test/r/ndb_rename.result -> mysql-test/suite/ndb/r/ndb_rename.result
      mysql-test/suite/ndb/r/ndb_update.result:
        Rename: mysql-test/r/ndb_update.result -> mysql-test/suite/ndb/r/ndb_update.result
      mysql-test/suite/ndb/r/ndb_view.result:
        Rename: mysql-test/r/ndb_view.result -> mysql-test/suite/ndb/r/ndb_view.result
      mysql-test/suite/ndb/t/ndb_alter_table2.test:
        Rename: mysql-test/t/ndb_alter_table2.test -> mysql-test/suite/ndb/t/ndb_alter_table2.test
      mysql-test/suite/ndb/t/ndb_autodiscover.test:
        Rename: mysql-test/t/ndb_autodiscover.test -> mysql-test/suite/ndb/t/ndb_autodiscover.test
      mysql-test/suite/ndb/t/ndb_binlog_discover.test:
        Rename: mysql-test/t/ndb_binlog_discover.test -> mysql-test/suite/ndb/t/ndb_binlog_discover.test
      mysql-test/suite/ndb/t/ndb_binlog_multi.test:
        Rename: mysql-test/t/ndb_binlog_multi.test -> mysql-test/suite/ndb/t/ndb_binlog_multi.test
      mysql-test/suite/ndb/t/ndb_cache_multi.test:
        Rename: mysql-test/t/ndb_cache_multi.test -> mysql-test/suite/ndb/t/ndb_cache_multi.test
      mysql-test/suite/ndb/t/ndb_partition_error2-master.opt:
        Rename: mysql-test/t/ndb_partition_error2-master.opt -> mysql-test/suite/ndb/t/ndb_partition_error2-master.opt
      mysql-test/suite/rpl/r/rpl000001.a.result:
        Rename: mysql-test/r/rpl000001.a.result -> mysql-test/suite/rpl/r/rpl000001.a.result
      mysql-test/suite/rpl/r/rpl_alter.result:
        Rename: mysql-test/r/rpl_alter.result -> mysql-test/suite/rpl/r/rpl_alter.result
      mysql-test/suite/rpl/r/rpl_insert_ignore.result:
        Rename: mysql-test/r/rpl_insert_ignore.result -> mysql-test/suite/rpl/r/rpl_insert_ignore.result
      mysql-test/suite/rpl/r/rpl_relayspace.result:
        Rename: mysql-test/r/rpl_relayspace.result -> mysql-test/suite/rpl/r/rpl_relayspace.result
      mysql-test/suite/rpl/r/rpl_row_func001.result:
        Rename: mysql-test/r/rpl_row_func001.result -> mysql-test/suite/rpl/r/rpl_row_func001.result
      mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result:
        Rename: mysql-test/r/rpl_row_inexist_tbl.result -> mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result
      mysql-test/suite/rpl/r/rpl_stm_insert_delayed.result:
        Rename: mysql-test/r/rpl_stm_insert_delayed.result -> mysql-test/suite/rpl/r/rpl_stm_insert_delayed.result
      mysql-test/suite/rpl/t/rpl_create_database.test:
        Rename: mysql-test/t/rpl_create_database.test -> mysql-test/suite/rpl/t/rpl_create_database.test
      mysql-test/suite/rpl/t/rpl_dual_pos_advance-master.opt:
        Rename: mysql-test/t/rpl_dual_pos_advance-master.opt -> mysql-test/suite/rpl/t/rpl_dual_pos_advance-master.opt
      mysql-test/suite/rpl/t/rpl_flushlog_loop-slave.sh:
        Rename: mysql-test/t/rpl_flushlog_loop-slave.sh -> mysql-test/suite/rpl/t/rpl_flushlog_loop-slave.sh
      mysql-test/suite/rpl/t/rpl_ignore_grant.test:
        Rename: mysql-test/t/rpl_ignore_grant.test -> mysql-test/suite/rpl/t/rpl_ignore_grant.test
      mysql-test/suite/rpl/t/rpl_multi_update2-slave.opt:
        Rename: mysql-test/t/rpl_multi_update2-slave.opt -> mysql-test/suite/rpl/t/rpl_multi_update2-slave.opt
      mysql-test/suite/rpl/t/rpl_multi_update4.test:
        Rename: mysql-test/t/rpl_multi_update4.test -> mysql-test/suite/rpl/t/rpl_multi_update4.test
      mysql-test/suite/rpl/t/rpl_rewrt_db.test:
        Rename: mysql-test/t/rpl_rewrt_db.test -> mysql-test/suite/rpl/t/rpl_rewrt_db.test
      mysql-test/suite/rpl/t/rpl_rotate_logs-master.opt:
        Rename: mysql-test/t/rpl_rotate_logs-master.opt -> mysql-test/suite/rpl/t/rpl_rotate_logs-master.opt
      mysql-test/suite/rpl/t/rpl_row_4_bytes.test:
        Rename: mysql-test/t/rpl_row_4_bytes.test -> mysql-test/suite/rpl/t/rpl_row_4_bytes.test
      mysql-test/suite/rpl/t/rpl_row_create_table-slave.opt:
        Rename: mysql-test/t/rpl_row_create_table-slave.opt -> mysql-test/suite/rpl/t/rpl_row_create_table-slave.opt
      mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test:
        Rename: mysql-test/t/rpl_row_flsh_tbls.test -> mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test
      mysql-test/suite/rpl/t/rpl_row_func003.test:
        Rename: mysql-test/t/rpl_row_func003.test -> mysql-test/suite/rpl/t/rpl_row_func003.test
      mysql-test/suite/rpl/t/rpl_row_sp007_innodb.test:
        Rename: mysql-test/t/rpl_row_sp007_innodb.test -> mysql-test/suite/rpl/t/rpl_row_sp007_innodb.test
      mysql-test/suite/rpl/t/rpl_row_stop_middle_update-slave.opt:
        Rename: mysql-test/t/rpl_row_stop_middle_update-slave.opt -> mysql-test/suite/rpl/t/rpl_row_stop_middle_update-slave.opt
      mysql-test/suite/rpl/t/rpl_row_tabledefs_3innodb.test:
        Rename: mysql-test/t/rpl_row_tabledefs_3innodb.test -> mysql-test/suite/rpl/t/rpl_row_tabledefs_3innodb.test
      mysql-test/suite/rpl/t/rpl_ssl1.test:
        Rename: mysql-test/t/rpl_ssl1.test -> mysql-test/suite/rpl/t/rpl_ssl1.test
      mysql-test/suite/rpl/t/rpl_stm_max_relay_size.test:
        Rename: mysql-test/t/rpl_stm_max_relay_size.test -> mysql-test/suite/rpl/t/rpl_stm_max_relay_size.test
      mysql-test/suite/rpl/t/rpl_stm_mystery22.test:
        Rename: mysql-test/t/rpl_stm_mystery22.test -> mysql-test/suite/rpl/t/rpl_stm_mystery22.test
      mysql-test/suite/rpl/t/rpl_truncate_7ndb_2.test:
        Rename: mysql-test/t/rpl_truncate_7ndb_2.test -> mysql-test/suite/rpl/t/rpl_truncate_7ndb_2.test
      mysql-test/suite/rpl/t/rpl_variables.test:
        Rename: mysql-test/t/rpl_variables.test -> mysql-test/suite/rpl/t/rpl_variables.test
      mysql-test/suite/rpl_ndb/r/rpl_ndb_auto_inc.result:
        Rename: mysql-test/r/rpl_ndb_auto_inc.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_auto_inc.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_do_db.result:
        Rename: mysql-test/r/rpl_ndb_do_db.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_do_db.result
      mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb.result:
        Rename: mysql-test/r/rpl_truncate_7ndb.result -> mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb.result
      mysql-test/suite/rpl_ndb/t/rpl_ndb_do_table.test:
        Rename: mysql-test/t/rpl_ndb_do_table.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_do_table.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_multi.test:
        Rename: mysql-test/t/rpl_ndb_multi.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_multi.test
      mysql-test/suite/binlog/r/binlog_row_blackhole.result:
        Rename: mysql-test/r/binlog_row_blackhole.result -> mysql-test/suite/binlog/r/binlog_row_blackhole.result
      mysql-test/suite/binlog/r/binlog_row_ctype_cp932.result:
        Rename: mysql-test/r/binlog_row_ctype_cp932.result -> mysql-test/suite/binlog/r/binlog_row_ctype_cp932.result
      mysql-test/suite/binlog/r/binlog_row_insert_select.result:
        Rename: mysql-test/r/binlog_row_insert_select.result -> mysql-test/suite/binlog/r/binlog_row_insert_select.result
      mysql-test/suite/binlog/r/binlog_stm_ps.result:
        Rename: mysql-test/r/binlog_stm_ps.result -> mysql-test/suite/binlog/r/binlog_stm_ps.result
      mysql-test/suite/binlog/t/binlog_row_binlog-master.opt:
        Rename: mysql-test/t/binlog_row_binlog-master.opt -> mysql-test/suite/binlog/t/binlog_row_binlog-master.opt
      mysql-test/suite/binlog/t/binlog_row_innodb_stat-master.opt:
        Rename: mysql-test/t/binlog_row_innodb_stat-master.opt -> mysql-test/suite/binlog/t/binlog_row_innodb_stat-master.opt
      mysql-test/suite/binlog/t/binlog_row_innodb_stat.test:
        Rename: mysql-test/t/binlog_row_innodb_stat.test -> mysql-test/suite/binlog/t/binlog_row_innodb_stat.test
      mysql-test/suite/binlog/t/binlog_stm_ctype_ucs.test:
        Rename: mysql-test/t/binlog_stm_ctype_ucs.test -> mysql-test/suite/binlog/t/binlog_stm_ctype_ucs.test
      mysql-test/suite/ndb/r/ndb_binlog_ddl_multi.result:
        Rename: mysql-test/r/ndb_binlog_ddl_multi.result -> mysql-test/suite/ndb/r/ndb_binlog_ddl_multi.result
      mysql-test/suite/ndb/r/ndb_dd_backuprestore.result:
        Rename: mysql-test/r/ndb_dd_backuprestore.result -> mysql-test/suite/ndb/r/ndb_dd_backuprestore.result
      mysql-test/suite/ndb/r/ndb_index_ordered.result:
        Rename: mysql-test/r/ndb_index_ordered.result -> mysql-test/suite/ndb/r/ndb_index_ordered.result
      mysql-test/suite/ndb/r/ndb_lock.result:
        Rename: mysql-test/r/ndb_lock.result -> mysql-test/suite/ndb/r/ndb_lock.result
      mysql-test/suite/ndb/r/ndb_partition_range.result:
        Rename: mysql-test/r/ndb_partition_range.result -> mysql-test/suite/ndb/r/ndb_partition_range.result
      mysql-test/suite/ndb/r/ndb_replace.result:
        Rename: mysql-test/r/ndb_replace.result -> mysql-test/suite/ndb/r/ndb_replace.result
      mysql-test/suite/ndb/t/ndb_alter_table3.test:
        Rename: mysql-test/t/ndb_alter_table3.test -> mysql-test/suite/ndb/t/ndb_alter_table3.test
      mysql-test/suite/ndb/t/ndb_binlog_basic.test:
        Rename: mysql-test/t/ndb_binlog_basic.test -> mysql-test/suite/ndb/t/ndb_binlog_basic.test
      mysql-test/suite/ndb/t/ndb_bitfield.test:
        Rename: mysql-test/t/ndb_bitfield.test -> mysql-test/suite/ndb/t/ndb_bitfield.test
      mysql-test/suite/ndb/t/ndb_blob_partition.test:
        Rename: mysql-test/t/ndb_blob_partition.test -> mysql-test/suite/ndb/t/ndb_blob_partition.test
      mysql-test/suite/ndb/t/ndb_cache.test:
        Rename: mysql-test/t/ndb_cache.test -> mysql-test/suite/ndb/t/ndb_cache.test
      mysql-test/suite/ndb/t/ndb_cache2.test:
        Rename: mysql-test/t/ndb_cache2.test -> mysql-test/suite/ndb/t/ndb_cache2.test
      mysql-test/suite/ndb/t/ndb_dd_alter.test:
        Rename: mysql-test/t/ndb_dd_alter.test -> mysql-test/suite/ndb/t/ndb_dd_alter.test
      mysql-test/suite/ndb/t/ndb_dd_backuprestore.test:
        Rename: mysql-test/t/ndb_dd_backuprestore.test -> mysql-test/suite/ndb/t/ndb_dd_backuprestore.test
      mysql-test/suite/ndb/t/ndb_limit.test:
        Rename: mysql-test/t/ndb_limit.test -> mysql-test/suite/ndb/t/ndb_limit.test
      mysql-test/suite/ndb/t/ndb_minmax.test:
        Rename: mysql-test/t/ndb_minmax.test -> mysql-test/suite/ndb/t/ndb_minmax.test
      mysql-test/suite/ndb/t/ndb_partition_list.test:
        Rename: mysql-test/t/ndb_partition_list.test -> mysql-test/suite/ndb/t/ndb_partition_list.test
      mysql-test/suite/ndb/t/ndb_restore_partition.test:
        Rename: mysql-test/t/ndb_restore_partition.test -> mysql-test/suite/ndb/t/ndb_restore_partition.test
      mysql-test/suite/ndb/t/ndb_restore_print.test:
        Rename: mysql-test/t/ndb_restore_print.test -> mysql-test/suite/ndb/t/ndb_restore_print.test
      mysql-test/suite/rpl/r/rpl000001.b.result:
        Rename: mysql-test/r/rpl000001.b.result -> mysql-test/suite/rpl/r/rpl000001.b.result
      mysql-test/suite/rpl/r/rpl000017.result:
        Rename: mysql-test/r/rpl000017.result -> mysql-test/suite/rpl/r/rpl000017.result
      mysql-test/suite/rpl/r/rpl_bit.result:
        Rename: mysql-test/r/rpl_bit.result -> mysql-test/suite/rpl/r/rpl_bit.result
      mysql-test/suite/rpl/r/rpl_dual_pos_advance.result:
        Rename: mysql-test/r/rpl_dual_pos_advance.result -> mysql-test/suite/rpl/r/rpl_dual_pos_advance.result
      mysql-test/suite/rpl/r/rpl_failed_optimize.result:
        Rename: mysql-test/r/rpl_failed_optimize.result -> mysql-test/suite/rpl/r/rpl_failed_optimize.result
      mysql-test/suite/rpl/r/rpl_ignore_table_update.result:
        Rename: mysql-test/r/rpl_ignore_table_update.result -> mysql-test/suite/rpl/r/rpl_ignore_table_update.result
      mysql-test/suite/rpl/r/rpl_insert_id_pk.result:
        Rename: mysql-test/r/rpl_insert_id_pk.result -> mysql-test/suite/rpl/r/rpl_insert_id_pk.result
      mysql-test/suite/rpl/r/rpl_known_bugs_detection.result:
        Rename: mysql-test/r/rpl_known_bugs_detection.result -> mysql-test/suite/rpl/r/rpl_known_bugs_detection.result
      mysql-test/suite/rpl/r/rpl_loaddata.result:
        Rename: mysql-test/r/rpl_loaddata.result -> mysql-test/suite/rpl/r/rpl_loaddata.result
      mysql-test/suite/rpl/r/rpl_redirect.result:
        Rename: mysql-test/r/rpl_redirect.result -> mysql-test/suite/rpl/r/rpl_redirect.result
      mysql-test/suite/rpl/r/rpl_row_NOW.result:
        Rename: mysql-test/r/rpl_row_NOW.result -> mysql-test/suite/rpl/r/rpl_row_NOW.result
      mysql-test/suite/rpl/r/rpl_row_func002.result:
        Rename: mysql-test/r/rpl_row_func002.result -> mysql-test/suite/rpl/r/rpl_row_func002.result
      mysql-test/suite/rpl/r/rpl_row_loaddata_m.result:
        Rename: mysql-test/r/rpl_row_loaddata_m.result -> mysql-test/suite/rpl/r/rpl_row_loaddata_m.result
      mysql-test/suite/rpl/r/rpl_row_stop_middle_update.result:
        Rename: mysql-test/r/rpl_row_stop_middle_update.result -> mysql-test/suite/rpl/r/rpl_row_stop_middle_update.result
      mysql-test/suite/rpl/r/rpl_row_trig001.result:
        Rename: mysql-test/r/rpl_row_trig001.result -> mysql-test/suite/rpl/r/rpl_row_trig001.result
      mysql-test/suite/rpl/r/rpl_stm_no_op.result:
        Rename: mysql-test/r/rpl_stm_no_op.result -> mysql-test/suite/rpl/r/rpl_stm_no_op.result
      mysql-test/suite/rpl/r/rpl_truncate_3innodb.result:
        Rename: mysql-test/r/rpl_truncate_3innodb.result -> mysql-test/suite/rpl/r/rpl_truncate_3innodb.result
      mysql-test/suite/rpl/t/rpl000011.test:
        Rename: mysql-test/t/rpl000011.test -> mysql-test/suite/rpl/t/rpl000011.test
      mysql-test/suite/rpl/t/rpl_alter_db.test:
        Rename: mysql-test/t/rpl_alter_db.test -> mysql-test/suite/rpl/t/rpl_alter_db.test
      mysql-test/suite/rpl/t/rpl_delete_no_where.test:
        Rename: mysql-test/t/rpl_delete_no_where.test -> mysql-test/suite/rpl/t/rpl_delete_no_where.test
      mysql-test/suite/rpl/t/rpl_dual_pos_advance.test:
        Rename: mysql-test/t/rpl_dual_pos_advance.test -> mysql-test/suite/rpl/t/rpl_dual_pos_advance.test
      mysql-test/suite/rpl/t/rpl_flushlog_loop-master.opt:
        Rename: mysql-test/t/rpl_flushlog_loop-master.opt -> mysql-test/suite/rpl/t/rpl_flushlog_loop-master.opt
      mysql-test/suite/rpl/t/rpl_flushlog_loop-master.sh:
        Rename: mysql-test/t/rpl_flushlog_loop-master.sh -> mysql-test/suite/rpl/t/rpl_flushlog_loop-master.sh
      mysql-test/suite/rpl/t/rpl_get_lock.test:
        Rename: mysql-test/t/rpl_get_lock.test -> mysql-test/suite/rpl/t/rpl_get_lock.test
      mysql-test/suite/rpl/t/rpl_ignore_grant-slave.opt:
        Rename: mysql-test/t/rpl_ignore_grant-slave.opt -> mysql-test/suite/rpl/t/rpl_ignore_grant-slave.opt
      mysql-test/suite/rpl/t/rpl_incident.test:
        Rename: mysql-test/t/rpl_incident.test -> mysql-test/suite/rpl/t/rpl_incident.test
      mysql-test/suite/rpl/t/rpl_insert_ignore-slave.opt:
        Rename: mysql-test/t/rpl_insert_ignore-slave.opt -> mysql-test/suite/rpl/t/rpl_insert_ignore-slave.opt
      mysql-test/suite/rpl/t/rpl_known_bugs_detection-master.opt:
        Rename: mysql-test/t/rpl_known_bugs_detection-master.opt -> mysql-test/suite/rpl/t/rpl_known_bugs_detection-master.opt
      mysql-test/suite/rpl/t/rpl_loaddata_m.test:
        Rename: mysql-test/t/rpl_loaddata_m.test -> mysql-test/suite/rpl/t/rpl_loaddata_m.test
      mysql-test/suite/rpl/t/rpl_loaddata_s-slave.opt:
        Rename: mysql-test/t/rpl_loaddata_s-slave.opt -> mysql-test/suite/rpl/t/rpl_loaddata_s-slave.opt
      mysql-test/suite/rpl/t/rpl_loadfile.test:
        Rename: mysql-test/t/rpl_loadfile.test -> mysql-test/suite/rpl/t/rpl_loadfile.test
      mysql-test/suite/rpl/t/rpl_read_only.test:
        Rename: mysql-test/t/rpl_read_only.test -> mysql-test/suite/rpl/t/rpl_read_only.test
      mysql-test/suite/rpl/t/rpl_redirect.test:
        Rename: mysql-test/t/rpl_redirect.test -> mysql-test/suite/rpl/t/rpl_redirect.test
      mysql-test/suite/rpl/t/rpl_relay_space_innodb.test:
        Rename: mysql-test/t/rpl_relay_space_innodb.test -> mysql-test/suite/rpl/t/rpl_relay_space_innodb.test
      mysql-test/suite/rpl/t/rpl_row_basic_11bugs-master.opt:
        Rename: mysql-test/t/rpl_row_basic_11bugs-master.opt -> mysql-test/suite/rpl/t/rpl_row_basic_11bugs-master.opt
      mysql-test/suite/rpl/t/rpl_row_err_daisychain-slave.opt:
        Rename: mysql-test/t/rpl_row_err_daisychain-slave.opt -> mysql-test/suite/rpl/t/rpl_row_err_daisychain-slave.opt
      mysql-test/suite/rpl/t/rpl_row_log-slave.opt:
        Rename: mysql-test/t/rpl_row_log-slave.opt -> mysql-test/suite/rpl/t/rpl_row_log-slave.opt
      mysql-test/suite/rpl/t/rpl_row_mysqlbinlog-master.opt:
        Rename: mysql-test/t/rpl_row_mysqlbinlog-master.opt -> mysql-test/suite/rpl/t/rpl_row_mysqlbinlog-master.opt
      mysql-test/suite/rpl/t/rpl_row_sp006_InnoDB.test:
        Rename: mysql-test/t/rpl_row_sp006_InnoDB.test -> mysql-test/suite/rpl/t/rpl_row_sp006_InnoDB.test
      mysql-test/suite/rpl/t/rpl_row_sp007_innodb-slave.opt:
        Rename: mysql-test/t/rpl_row_sp007_innodb-slave.opt -> mysql-test/suite/rpl/t/rpl_row_sp007_innodb-slave.opt
      mysql-test/suite/rpl/t/rpl_row_stop_middle_update-master.opt:
        Rename: mysql-test/t/rpl_row_stop_middle_update-master.opt -> mysql-test/suite/rpl/t/rpl_row_stop_middle_update-master.opt
      mysql-test/suite/rpl/t/rpl_row_tabledefs_3innodb-slave.opt:
        Rename: mysql-test/t/rpl_row_tabledefs_3innodb-slave.opt -> mysql-test/suite/rpl/t/rpl_row_tabledefs_3innodb-slave.opt
      mysql-test/suite/rpl/t/rpl_sp_effects-slave.opt:
        Rename: mysql-test/t/rpl_sp_effects-slave.opt -> mysql-test/suite/rpl/t/rpl_sp_effects-slave.opt
      mysql-test/suite/rpl/t/rpl_sp_effects.test:
        Rename: mysql-test/t/rpl_sp_effects.test -> mysql-test/suite/rpl/t/rpl_sp_effects.test
      mysql-test/suite/rpl/t/rpl_sporadic_master-master.opt:
        Rename: mysql-test/t/rpl_sporadic_master-master.opt -> mysql-test/suite/rpl/t/rpl_sporadic_master-master.opt
      mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test:
        Rename: mysql-test/t/rpl_switch_stm_row_mixed.test -> mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test
      mysql-test/suite/rpl/t/rpl_temporary.test:
        Rename: mysql-test/t/rpl_temporary.test -> mysql-test/suite/rpl/t/rpl_temporary.test
      mysql-test/suite/rpl/t/rpl_timezone-master.opt:
        Rename: mysql-test/t/rpl_timezone-master.opt -> mysql-test/suite/rpl/t/rpl_timezone-master.opt
      mysql-test/suite/rpl/t/rpl_trigger.test:
        Rename: mysql-test/t/rpl_trigger.test -> mysql-test/suite/rpl/t/rpl_trigger.test
      mysql-test/suite/rpl/t/rpl_trunc_temp.test:
        Rename: mysql-test/t/rpl_trunc_temp.test -> mysql-test/suite/rpl/t/rpl_trunc_temp.test
      mysql-test/suite/rpl_ndb/r/rpl_ndb_bank.result:
        Rename: mysql-test/r/rpl_ndb_bank.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_bank.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_blob.result:
        Rename: mysql-test/r/rpl_ndb_blob.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_blob.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_blob2.result:
        Rename: mysql-test/r/rpl_ndb_blob2.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_blob2.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_relayrotate.result:
        Rename: mysql-test/r/rpl_ndb_relayrotate.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_relayrotate.result
      mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb.test:
        Rename: mysql-test/t/rpl_ndb_2innodb.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_charset.test:
        Rename: mysql-test/t/rpl_ndb_charset.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_charset.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_basic.test:
        Rename: mysql-test/t/rpl_ndb_dd_basic.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_basic.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_ddl.test:
        Rename: mysql-test/t/rpl_ndb_ddl.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_ddl.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_delete_nowhere.test:
        Rename: mysql-test/t/rpl_ndb_delete_nowhere.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_delete_nowhere.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_do_db-slave.opt:
        Rename: mysql-test/t/rpl_ndb_do_db-slave.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_do_db-slave.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb-master.opt:
        Rename: mysql-test/t/rpl_ndb_innodb2ndb-master.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb-master.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_log-master.opt:
        Rename: mysql-test/t/rpl_ndb_log-master.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_log-master.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_relayrotate-slave.opt:
        Rename: mysql-test/t/rpl_ndb_relayrotate-slave.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_relayrotate-slave.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_sp006.test:
        Rename: mysql-test/t/rpl_ndb_sp006.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_sp006.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_trig004.test:
        Rename: mysql-test/t/rpl_ndb_trig004.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_trig004.test
      mysql-test/suite/binlog/r/binlog_stm_ctype_cp932.result:
        Rename: mysql-test/r/binlog_stm_ctype_cp932.result -> mysql-test/suite/binlog/r/binlog_stm_ctype_cp932.result
      mysql-test/suite/ndb/r/ndb_basic.result:
        Rename: mysql-test/r/ndb_basic.result -> mysql-test/suite/ndb/r/ndb_basic.result
      mysql-test/suite/ndb/r/ndb_binlog_log_bin.result:
        Rename: mysql-test/r/ndb_binlog_log_bin.result -> mysql-test/suite/ndb/r/ndb_binlog_log_bin.result
      mysql-test/suite/ndb/r/ndb_cursor.result:
        Rename: mysql-test/r/ndb_cursor.result -> mysql-test/suite/ndb/r/ndb_cursor.result
      mysql-test/suite/ndb/r/ndb_dd_basic.result:
        Rename: mysql-test/r/ndb_dd_basic.result -> mysql-test/suite/ndb/r/ndb_dd_basic.result
      mysql-test/suite/ndb/r/ndb_dd_sql_features.result:
        Rename: mysql-test/r/ndb_dd_sql_features.result -> mysql-test/suite/ndb/r/ndb_dd_sql_features.result
      mysql-test/suite/ndb/r/ndb_gis.result:
        Rename: mysql-test/r/ndb_gis.result -> mysql-test/suite/ndb/r/ndb_gis.result
      mysql-test/suite/ndb/r/ndb_load.result:
        Rename: mysql-test/r/ndb_load.result -> mysql-test/suite/ndb/r/ndb_load.result
      mysql-test/suite/ndb/r/ndb_multi_row.result:
        Rename: mysql-test/r/ndb_multi_row.result -> mysql-test/suite/ndb/r/ndb_multi_row.result
      mysql-test/suite/ndb/r/ndb_trigger.result:
        Rename: mysql-test/r/ndb_trigger.result -> mysql-test/suite/ndb/r/ndb_trigger.result
      mysql-test/suite/ndb/r/ndb_types.result:
        Rename: mysql-test/r/ndb_types.result -> mysql-test/suite/ndb/r/ndb_types.result
      mysql-test/suite/ndb/t/ndb_alter_table.test:
        Rename: mysql-test/t/ndb_alter_table.test -> mysql-test/suite/ndb/t/ndb_alter_table.test
      mysql-test/suite/ndb/t/ndb_basic.test:
        Rename: mysql-test/t/ndb_basic.test -> mysql-test/suite/ndb/t/ndb_basic.test
      mysql-test/suite/ndb/t/ndb_binlog_ignore_db-master.opt:
        Rename: mysql-test/t/ndb_binlog_ignore_db-master.opt -> mysql-test/suite/ndb/t/ndb_binlog_ignore_db-master.opt
      mysql-test/suite/ndb/t/ndb_blob.test:
        Rename: mysql-test/t/ndb_blob.test -> mysql-test/suite/ndb/t/ndb_blob.test
      mysql-test/suite/ndb/t/ndb_dd_ddl.test:
        Rename: mysql-test/t/ndb_dd_ddl.test -> mysql-test/suite/ndb/t/ndb_dd_ddl.test
      mysql-test/suite/ndb/t/ndb_dd_disk2memory.test:
        Rename: mysql-test/t/ndb_dd_disk2memory.test -> mysql-test/suite/ndb/t/ndb_dd_disk2memory.test
      mysql-test/suite/ndb/t/ndb_index_unique.test:
        Rename: mysql-test/t/ndb_index_unique.test -> mysql-test/suite/ndb/t/ndb_index_unique.test
      mysql-test/suite/ndb/t/ndb_read_multi_range.test:
        Rename: mysql-test/t/ndb_read_multi_range.test -> mysql-test/suite/ndb/t/ndb_read_multi_range.test
      mysql-test/suite/ndb/t/ndb_row_format.test:
        Rename: mysql-test/t/ndb_row_format.test -> mysql-test/suite/ndb/t/ndb_row_format.test
      mysql-test/suite/rpl/r/rpl_alter_db.result:
        Rename: mysql-test/r/rpl_alter_db.result -> mysql-test/suite/rpl/r/rpl_alter_db.result
      mysql-test/suite/rpl/r/rpl_drop_db.result:
        Rename: mysql-test/r/rpl_drop_db.result -> mysql-test/suite/rpl/r/rpl_drop_db.result
      mysql-test/suite/rpl/r/rpl_log_pos.result:
        Rename: mysql-test/r/rpl_log_pos.result -> mysql-test/suite/rpl/r/rpl_log_pos.result
      mysql-test/suite/rpl/r/rpl_multi_update3.result:
        Rename: mysql-test/r/rpl_multi_update3.result -> mysql-test/suite/rpl/r/rpl_multi_update3.result
      mysql-test/suite/rpl/r/rpl_rewrt_db.result:
        Rename: mysql-test/r/rpl_rewrt_db.result -> mysql-test/suite/rpl/r/rpl_rewrt_db.result
      mysql-test/suite/rpl/r/rpl_row_create_table.result:
        Rename: mysql-test/r/rpl_row_create_table.result -> mysql-test/suite/rpl/r/rpl_row_create_table.result
      mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result:
        Rename: mysql-test/r/rpl_row_flsh_tbls.result -> mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result
      mysql-test/suite/rpl/r/rpl_row_func003.result:
        Rename: mysql-test/r/rpl_row_func003.result -> mysql-test/suite/rpl/r/rpl_row_func003.result
      mysql-test/suite/rpl/r/rpl_row_sp008.result:
        Rename: mysql-test/r/rpl_row_sp008.result -> mysql-test/suite/rpl/r/rpl_row_sp008.result
      mysql-test/suite/rpl/r/rpl_row_trig002.result:
        Rename: mysql-test/r/rpl_row_trig002.result -> mysql-test/suite/rpl/r/rpl_row_trig002.result
      mysql-test/suite/rpl/r/rpl_sp004.result:
        Rename: mysql-test/r/rpl_sp004.result -> mysql-test/suite/rpl/r/rpl_sp004.result
      mysql-test/suite/rpl/r/rpl_ssl.result:
        Rename: mysql-test/r/rpl_ssl.result -> mysql-test/suite/rpl/r/rpl_ssl.result
      mysql-test/suite/rpl/r/rpl_stm_EE_err2.result:
        Rename: mysql-test/r/rpl_stm_EE_err2.result -> mysql-test/suite/rpl/r/rpl_stm_EE_err2.result
      mysql-test/suite/rpl/r/rpl_stm_multi_query.result:
        Rename: mysql-test/r/rpl_stm_multi_query.result -> mysql-test/suite/rpl/r/rpl_stm_multi_query.result
      mysql-test/suite/rpl/t/rpl000013.test:
        Rename: mysql-test/t/rpl000013.test -> mysql-test/suite/rpl/t/rpl000013.test
      mysql-test/suite/rpl/t/rpl000017-slave.opt:
        Rename: mysql-test/t/rpl000017-slave.opt -> mysql-test/suite/rpl/t/rpl000017-slave.opt
      mysql-test/suite/rpl/t/rpl_drop_db.test:
        Rename: mysql-test/t/rpl_drop_db.test -> mysql-test/suite/rpl/t/rpl_drop_db.test
      mysql-test/suite/rpl/t/rpl_flushlog_loop.test:
        Rename: mysql-test/t/rpl_flushlog_loop.test -> mysql-test/suite/rpl/t/rpl_flushlog_loop.test
      mysql-test/suite/rpl/t/rpl_load_from_master.test:
        Rename: mysql-test/t/rpl_load_from_master.test -> mysql-test/suite/rpl/t/rpl_load_from_master.test
      mysql-test/suite/rpl/t/rpl_locale.test:
        Rename: mysql-test/t/rpl_locale.test -> mysql-test/suite/rpl/t/rpl_locale.test
      mysql-test/suite/rpl/t/rpl_multi_delete-slave.opt:
        Rename: mysql-test/t/rpl_multi_delete-slave.opt -> mysql-test/suite/rpl/t/rpl_multi_delete-slave.opt
      mysql-test/suite/rpl/t/rpl_rotate_logs.test:
        Rename: mysql-test/t/rpl_rotate_logs.test -> mysql-test/suite/rpl/t/rpl_rotate_logs.test
      mysql-test/suite/rpl/t/rpl_row_NOW.test:
        Rename: mysql-test/t/rpl_row_NOW.test -> mysql-test/suite/rpl/t/rpl_row_NOW.test
      mysql-test/suite/rpl/t/rpl_row_err_daisychain-master.opt:
        Rename: mysql-test/t/rpl_row_err_daisychain-master.opt -> mysql-test/suite/rpl/t/rpl_row_err_daisychain-master.opt
      mysql-test/suite/rpl/t/rpl_row_inexist_tbl.test:
        Rename: mysql-test/t/rpl_row_inexist_tbl.test -> mysql-test/suite/rpl/t/rpl_row_inexist_tbl.test
      mysql-test/suite/rpl/t/rpl_row_mystery22.test:
        Rename: mysql-test/t/rpl_row_mystery22.test -> mysql-test/suite/rpl/t/rpl_row_mystery22.test
      mysql-test/suite/rpl/t/rpl_row_sp003.test:
        Rename: mysql-test/t/rpl_row_sp003.test -> mysql-test/suite/rpl/t/rpl_row_sp003.test
      mysql-test/suite/rpl/t/rpl_row_sp011.test:
        Rename: mysql-test/t/rpl_row_sp011.test -> mysql-test/suite/rpl/t/rpl_row_sp011.test
      mysql-test/suite/rpl/t/rpl_server_id1.test:
        Rename: mysql-test/t/rpl_server_id1.test -> mysql-test/suite/rpl/t/rpl_server_id1.test
      mysql-test/suite/rpl/t/rpl_session_var.test:
        Rename: mysql-test/t/rpl_session_var.test -> mysql-test/suite/rpl/t/rpl_session_var.test
      mysql-test/suite/rpl/t/rpl_skip_error.test:
        Rename: mysql-test/t/rpl_skip_error.test -> mysql-test/suite/rpl/t/rpl_skip_error.test
      mysql-test/suite/rpl_ndb/r/rpl_ndb_commit_afterflush.result:
        Rename: mysql-test/r/rpl_ndb_commit_afterflush.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_commit_afterflush.result
      mysql-test/suite/rpl_ndb/t/rpl_ndb_do_db.test:
        Rename: mysql-test/t/rpl_ndb_do_db.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_do_db.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb-slave.opt:
        Rename: mysql-test/t/rpl_ndb_innodb2ndb-slave.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb-slave.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update2-slave.opt:
        Rename: mysql-test/t/rpl_ndb_multi_update2-slave.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update2-slave.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update2.test:
        Rename: mysql-test/t/rpl_ndb_multi_update2.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update2.test
      mysql-test/suite/binlog/r/binlog_statement_insert_delayed.result:
        Rename: mysql-test/r/binlog_statement_insert_delayed.result -> mysql-test/suite/binlog/r/binlog_statement_insert_delayed.result
      mysql-test/suite/binlog/t/binlog_row_blackhole.test:
        Rename: mysql-test/t/binlog_row_blackhole.test -> mysql-test/suite/binlog/t/binlog_row_blackhole.test
      mysql-test/suite/ndb/r/ndb_limit.result:
        Rename: mysql-test/r/ndb_limit.result -> mysql-test/suite/ndb/r/ndb_limit.result
      mysql-test/suite/ndb/t/ndb_dd_basic.test:
        Rename: mysql-test/t/ndb_dd_basic.test -> mysql-test/suite/ndb/t/ndb_dd_basic.test
      mysql-test/suite/ndb/t/ndb_types.test:
        Rename: mysql-test/t/ndb_types.test -> mysql-test/suite/ndb/t/ndb_types.test
      mysql-test/suite/ndb/t/ndb_update.test:
        Rename: mysql-test/t/ndb_update.test -> mysql-test/suite/ndb/t/ndb_update.test
      mysql-test/suite/rpl/r/rpl_extraCol_innodb.result:
        Rename: mysql-test/r/rpl_extraCol_innodb.result -> mysql-test/suite/rpl/r/rpl_extraCol_innodb.result
      mysql-test/suite/rpl/r/rpl_loaddata_charset.result:
        Rename: mysql-test/r/rpl_loaddata_charset.result -> mysql-test/suite/rpl/r/rpl_loaddata_charset.result
      mysql-test/suite/rpl/r/rpl_loaddata_m.result:
        Rename: mysql-test/r/rpl_loaddata_m.result -> mysql-test/suite/rpl/r/rpl_loaddata_m.result
      mysql-test/suite/rpl/r/rpl_multi_delete.result:
        Rename: mysql-test/r/rpl_multi_delete.result -> mysql-test/suite/rpl/r/rpl_multi_delete.result
      mysql-test/suite/rpl/r/rpl_multi_delete2.result:
        Rename: mysql-test/r/rpl_multi_delete2.result -> mysql-test/suite/rpl/r/rpl_multi_delete2.result
      mysql-test/suite/rpl/r/rpl_row_sp009.result:
        Rename: mysql-test/r/rpl_row_sp009.result -> mysql-test/suite/rpl/r/rpl_row_sp009.result
      mysql-test/suite/rpl/r/rpl_row_sp010.result:
        Rename: mysql-test/r/rpl_row_sp010.result -> mysql-test/suite/rpl/r/rpl_row_sp010.result
      mysql-test/suite/rpl/r/rpl_set_charset.result:
        Rename: mysql-test/r/rpl_set_charset.result -> mysql-test/suite/rpl/r/rpl_set_charset.result
      mysql-test/suite/rpl/r/rpl_skip_error.result:
        Rename: mysql-test/r/rpl_skip_error.result -> mysql-test/suite/rpl/r/rpl_skip_error.result
      mysql-test/suite/rpl/r/rpl_stm_charset.result:
        Rename: mysql-test/r/rpl_stm_charset.result -> mysql-test/suite/rpl/r/rpl_stm_charset.result
      mysql-test/suite/rpl/r/rpl_trigger.result:
        Rename: mysql-test/r/rpl_trigger.result -> mysql-test/suite/rpl/r/rpl_trigger.result
      mysql-test/suite/rpl/t/rpl_auto_increment-master.opt:
        Rename: mysql-test/t/rpl_auto_increment-master.opt -> mysql-test/suite/rpl/t/rpl_auto_increment-master.opt
      mysql-test/suite/rpl/t/rpl_bit_npk.test:
        Rename: mysql-test/t/rpl_bit_npk.test -> mysql-test/suite/rpl/t/rpl_bit_npk.test
      mysql-test/suite/rpl/t/rpl_extraCol_innodb.test:
        Rename: mysql-test/t/rpl_extraCol_innodb.test -> mysql-test/suite/rpl/t/rpl_extraCol_innodb.test
      mysql-test/suite/rpl/t/rpl_free_items-slave.opt:
        Rename: mysql-test/t/rpl_free_items-slave.opt -> mysql-test/suite/rpl/t/rpl_free_items-slave.opt
      mysql-test/suite/rpl/t/rpl_init_slave.test:
        Rename: mysql-test/t/rpl_init_slave.test -> mysql-test/suite/rpl/t/rpl_init_slave.test
      mysql-test/suite/rpl/t/rpl_packet-slave.opt:
        Rename: mysql-test/t/rpl_packet-slave.opt -> mysql-test/suite/rpl/t/rpl_packet-slave.opt
      mysql-test/suite/rpl/t/rpl_relay_space_innodb-slave.opt:
        Rename: mysql-test/t/rpl_relay_space_innodb-slave.opt -> mysql-test/suite/rpl/t/rpl_relay_space_innodb-slave.opt
      mysql-test/suite/rpl/t/rpl_rotate_logs.slave-mi:
        Rename: mysql-test/t/rpl_rotate_logs.slave-mi -> mysql-test/suite/rpl/t/rpl_rotate_logs.slave-mi
      mysql-test/suite/rpl/t/rpl_row_USER.test:
        Rename: mysql-test/t/rpl_row_USER.test -> mysql-test/suite/rpl/t/rpl_row_USER.test
      mysql-test/suite/rpl/t/rpl_row_delayed_ins.test:
        Rename: mysql-test/t/rpl_row_delayed_ins.test -> mysql-test/suite/rpl/t/rpl_row_delayed_ins.test
      mysql-test/suite/rpl/t/rpl_row_sp002_innodb-slave.opt:
        Rename: mysql-test/t/rpl_row_sp002_innodb-slave.opt -> mysql-test/suite/rpl/t/rpl_row_sp002_innodb-slave.opt
      mysql-test/suite/rpl/t/rpl_row_trig002.test:
        Rename: mysql-test/t/rpl_row_trig002.test -> mysql-test/suite/rpl/t/rpl_row_trig002.test
      mysql-test/suite/rpl/t/rpl_sf.test:
        Rename: mysql-test/t/rpl_sf.test -> mysql-test/suite/rpl/t/rpl_sf.test
      mysql-test/suite/rpl/t/rpl_stm_no_op.test:
        Rename: mysql-test/t/rpl_stm_no_op.test -> mysql-test/suite/rpl/t/rpl_stm_no_op.test
      mysql-test/suite/rpl/t/rpl_udf-slave.opt:
        Rename: mysql-test/t/rpl_udf-slave.opt -> mysql-test/suite/rpl/t/rpl_udf-slave.opt
      mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_partitions.result:
        Rename: mysql-test/r/rpl_ndb_dd_partitions.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_partitions.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_multi.result:
        Rename: mysql-test/r/rpl_ndb_multi.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_multi.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_rep_ignore.result:
        Rename: mysql-test/r/rpl_ndb_rep_ignore.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_rep_ignore.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_sp006.result:
        Rename: mysql-test/r/rpl_ndb_sp006.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_sp006.result
      mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam-slave.opt:
        Rename: mysql-test/t/rpl_ndb_2myisam-slave.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam-slave.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_idempotent.test:
        Rename: mysql-test/t/rpl_ndb_idempotent.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_idempotent.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_sp003.test:
        Rename: mysql-test/t/rpl_ndb_sp003.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_sp003.test
      mysql-test/suite/binlog/r/binlog_row_binlog.result:
        Rename: mysql-test/r/binlog_row_binlog.result -> mysql-test/suite/binlog/r/binlog_row_binlog.result
      mysql-test/suite/binlog/r/binlog_stm_blackhole.result:
        Rename: mysql-test/r/binlog_stm_blackhole.result -> mysql-test/suite/binlog/r/binlog_stm_blackhole.result
      mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
        Rename: mysql-test/r/binlog_stm_mix_innodb_myisam.result -> mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
      mysql-test/suite/binlog/t/binlog_row_drop_tmp_tbl.test:
        Rename: mysql-test/t/binlog_row_drop_tmp_tbl.test -> mysql-test/suite/binlog/t/binlog_row_drop_tmp_tbl.test
      mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam-master.opt:
        Rename: mysql-test/t/binlog_row_mix_innodb_myisam-master.opt -> mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam-master.opt
      mysql-test/suite/binlog/t/binlog_statement_insert_delayed.test:
        Rename: mysql-test/t/binlog_statement_insert_delayed.test -> mysql-test/suite/binlog/t/binlog_statement_insert_delayed.test
      mysql-test/suite/binlog/t/binlog_stm_binlog-master.opt:
        Rename: mysql-test/t/binlog_stm_binlog-master.opt -> mysql-test/suite/binlog/t/binlog_stm_binlog-master.opt
      mysql-test/suite/ndb/r/ndb_alter_table2.result:
        Rename: mysql-test/r/ndb_alter_table2.result -> mysql-test/suite/ndb/r/ndb_alter_table2.result
      mysql-test/suite/ndb/r/ndb_blob.result:
        Rename: mysql-test/r/ndb_blob.result -> mysql-test/suite/ndb/r/ndb_blob.result
      mysql-test/suite/ndb/r/ndb_cache_multi2.result:
        Rename: mysql-test/r/ndb_cache_multi2.result -> mysql-test/suite/ndb/r/ndb_cache_multi2.result
      mysql-test/suite/ndb/r/ndb_config2.result:
        Rename: mysql-test/r/ndb_config2.result -> mysql-test/suite/ndb/r/ndb_config2.result
      mysql-test/suite/ndb/t/ndb_truncate.test:
        Rename: mysql-test/t/ndb_truncate.test -> mysql-test/suite/ndb/t/ndb_truncate.test
      mysql-test/suite/ndb/t/ndbapi.test:
        Rename: mysql-test/t/ndbapi.test -> mysql-test/suite/ndb/t/ndbapi.test
      mysql-test/suite/rpl/r/rpl_charset_sjis.result:
        Rename: mysql-test/r/rpl_charset_sjis.result -> mysql-test/suite/rpl/r/rpl_charset_sjis.result
      mysql-test/suite/rpl/r/rpl_extraCol_myisam.result:
        Rename: mysql-test/r/rpl_extraCol_myisam.result -> mysql-test/suite/rpl/r/rpl_extraCol_myisam.result
      mysql-test/suite/rpl/r/rpl_locale.result:
        Rename: mysql-test/r/rpl_locale.result -> mysql-test/suite/rpl/r/rpl_locale.result
      mysql-test/suite/rpl/r/rpl_multi_update2.result:
        Rename: mysql-test/r/rpl_multi_update2.result -> mysql-test/suite/rpl/r/rpl_multi_update2.result
      mysql-test/suite/rpl/r/rpl_relay_space_innodb.result:
        Rename: mysql-test/r/rpl_relay_space_innodb.result -> mysql-test/suite/rpl/r/rpl_relay_space_innodb.result
      mysql-test/suite/rpl/r/rpl_row_insert_delayed.result:
        Rename: mysql-test/r/rpl_row_insert_delayed.result -> mysql-test/suite/rpl/r/rpl_row_insert_delayed.result
      mysql-test/suite/rpl/r/rpl_row_log_innodb.result:
        Rename: mysql-test/r/rpl_row_log_innodb.result -> mysql-test/suite/rpl/r/rpl_row_log_innodb.result
      mysql-test/suite/rpl/r/rpl_row_multi_query.result:
        Rename: mysql-test/r/rpl_row_multi_query.result -> mysql-test/suite/rpl/r/rpl_row_multi_query.result
      mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
        Rename: mysql-test/r/rpl_row_tabledefs_3innodb.result -> mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result
      mysql-test/suite/rpl/r/rpl_row_trig003.result:
        Rename: mysql-test/r/rpl_row_trig003.result -> mysql-test/suite/rpl/r/rpl_row_trig003.result
      mysql-test/suite/rpl/r/rpl_row_until.result:
        Rename: mysql-test/r/rpl_row_until.result -> mysql-test/suite/rpl/r/rpl_row_until.result
      mysql-test/suite/rpl/t/rpl_empty_master_crash-master.opt:
        Rename: mysql-test/t/rpl_empty_master_crash-master.opt -> mysql-test/suite/rpl/t/rpl_empty_master_crash-master.opt
      mysql-test/suite/rpl/t/rpl_free_items.test:
        Rename: mysql-test/t/rpl_free_items.test -> mysql-test/suite/rpl/t/rpl_free_items.test
      mysql-test/suite/rpl/t/rpl_ps.test:
        Rename: mysql-test/t/rpl_ps.test -> mysql-test/suite/rpl/t/rpl_ps.test
      mysql-test/suite/rpl/t/rpl_relay_space_myisam.test:
        Rename: mysql-test/t/rpl_relay_space_myisam.test -> mysql-test/suite/rpl/t/rpl_relay_space_myisam.test
      mysql-test/suite/rpl/t/rpl_relayrotate.test:
        Rename: mysql-test/t/rpl_relayrotate.test -> mysql-test/suite/rpl/t/rpl_relayrotate.test
      mysql-test/suite/rpl/t/rpl_relayspace.test:
        Rename: mysql-test/t/rpl_relayspace.test -> mysql-test/suite/rpl/t/rpl_relayspace.test
      mysql-test/suite/rpl/t/rpl_row_sp003-master.opt:
        Rename: mysql-test/t/rpl_row_sp003-master.opt -> mysql-test/suite/rpl/t/rpl_row_sp003-master.opt
      mysql-test/suite/rpl_ndb/r/rpl_ndb_sync.result:
        Rename: mysql-test/r/rpl_ndb_sync.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_sync.result
      mysql-test/suite/rpl_ndb/r/rpl_ndbapi_multi.result:
        Rename: mysql-test/r/rpl_ndbapi_multi.result -> mysql-test/suite/rpl_ndb/r/rpl_ndbapi_multi.result
      mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam.test:
        Rename: mysql-test/t/rpl_ndb_2myisam.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_func003.test:
        Rename: mysql-test/t/rpl_ndb_func003.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_func003.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb_trans.test:
        Rename: mysql-test/t/rpl_ndb_innodb_trans.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb_trans.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_load.test:
        Rename: mysql-test/t/rpl_ndb_load.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_load.test
      mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb.test:
        Rename: mysql-test/t/rpl_truncate_7ndb.test -> mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb.test
      mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam.test:
        Rename: mysql-test/t/binlog_row_mix_innodb_myisam.test -> mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam.test
      mysql-test/suite/binlog/t/binlog_stm_binlog.test:
        Rename: mysql-test/t/binlog_stm_binlog.test -> mysql-test/suite/binlog/t/binlog_stm_binlog.test
      mysql-test/suite/binlog/t/binlog_stm_ctype_cp932.test:
        Rename: mysql-test/t/binlog_stm_ctype_cp932.test -> mysql-test/suite/binlog/t/binlog_stm_ctype_cp932.test
      mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam-master.opt:
        Rename: mysql-test/t/binlog_stm_mix_innodb_myisam-master.opt -> mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam-master.opt
      mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test:
        Rename: mysql-test/t/binlog_stm_mix_innodb_myisam.test -> mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test
      mysql-test/suite/ndb/r/ndb_alter_table3.result:
        Rename: mysql-test/r/ndb_alter_table3.result -> mysql-test/suite/ndb/r/ndb_alter_table3.result
      mysql-test/suite/ndb/r/ndb_autodiscover2.result:
        Rename: mysql-test/r/ndb_autodiscover2.result -> mysql-test/suite/ndb/r/ndb_autodiscover2.result
      mysql-test/suite/ndb/r/ndb_backup_print.result:
        Rename: mysql-test/r/ndb_backup_print.result -> mysql-test/suite/ndb/r/ndb_backup_print.result
      mysql-test/suite/ndb/r/ndb_binlog_basic.result:
        Rename: mysql-test/r/ndb_binlog_basic.result -> mysql-test/suite/ndb/r/ndb_binlog_basic.result
      mysql-test/suite/ndb/r/ndb_condition_pushdown.result:
        Rename: mysql-test/r/ndb_condition_pushdown.result -> mysql-test/suite/ndb/r/ndb_condition_pushdown.result
      mysql-test/suite/ndb/r/ndb_dd_ddl.result:
        Rename: mysql-test/r/ndb_dd_ddl.result -> mysql-test/suite/ndb/r/ndb_dd_ddl.result
      mysql-test/suite/ndb/r/ndb_dd_dump.result:
        Rename: mysql-test/r/ndb_dd_dump.result -> mysql-test/suite/ndb/r/ndb_dd_dump.result
      mysql-test/suite/ndb/r/ndb_loaddatalocal.result:
        Rename: mysql-test/r/ndb_loaddatalocal.result -> mysql-test/suite/ndb/r/ndb_loaddatalocal.result
      mysql-test/suite/ndb/r/ndb_restore_compat.result:
        Rename: mysql-test/r/ndb_restore_compat.result -> mysql-test/suite/ndb/r/ndb_restore_compat.result
      mysql-test/suite/ndb/r/ndb_row_format.result:
        Rename: mysql-test/r/ndb_row_format.result -> mysql-test/suite/ndb/r/ndb_row_format.result
      mysql-test/suite/ndb/r/ndb_sp.result:
        Rename: mysql-test/r/ndb_sp.result -> mysql-test/suite/ndb/r/ndb_sp.result
      mysql-test/suite/ndb/r/ndb_temporary.result:
        Rename: mysql-test/r/ndb_temporary.result -> mysql-test/suite/ndb/r/ndb_temporary.result
      mysql-test/suite/ndb/r/ps_7ndb.result:
        Rename: mysql-test/r/ps_7ndb.result -> mysql-test/suite/ndb/r/ps_7ndb.result
      mysql-test/suite/ndb/t/ndb_binlog_ddl_multi.test:
        Rename: mysql-test/t/ndb_binlog_ddl_multi.test -> mysql-test/suite/ndb/t/ndb_binlog_ddl_multi.test
      mysql-test/suite/ndb/t/ndb_cache_multi2.test:
        Rename: mysql-test/t/ndb_cache_multi2.test -> mysql-test/suite/ndb/t/ndb_cache_multi2.test
      mysql-test/suite/ndb/t/ndb_charset.test:
        Rename: mysql-test/t/ndb_charset.test -> mysql-test/suite/ndb/t/ndb_charset.test
      mysql-test/suite/ndb/t/ndb_dd_sql_features.test:
        Rename: mysql-test/t/ndb_dd_sql_features.test -> mysql-test/suite/ndb/t/ndb_dd_sql_features.test
      mysql-test/suite/ndb/t/ndb_loaddatalocal.test:
        Rename: mysql-test/t/ndb_loaddatalocal.test -> mysql-test/suite/ndb/t/ndb_loaddatalocal.test
      mysql-test/suite/ndb/t/ndb_multi_row.test:
        Rename: mysql-test/t/ndb_multi_row.test -> mysql-test/suite/ndb/t/ndb_multi_row.test
      mysql-test/suite/ndb/t/ndb_restore.test:
        Rename: mysql-test/t/ndb_restore.test -> mysql-test/suite/ndb/t/ndb_restore.test
      mysql-test/suite/ndb/t/partition_03ndb.test:
        Rename: mysql-test/t/partition_03ndb.test -> mysql-test/suite/ndb/t/partition_03ndb.test
      mysql-test/suite/ndb/t/ps_7ndb.test:
        Rename: mysql-test/t/ps_7ndb.test -> mysql-test/suite/ndb/t/ps_7ndb.test
      mysql-test/suite/rpl/r/rpl000013.result:
        Rename: mysql-test/r/rpl000013.result -> mysql-test/suite/rpl/r/rpl000013.result
      mysql-test/suite/rpl/r/rpl_auto_increment_11932.result:
        Rename: mysql-test/r/rpl_auto_increment_11932.result -> mysql-test/suite/rpl/r/rpl_auto_increment_11932.result
      mysql-test/suite/rpl/r/rpl_change_master.result:
        Rename: mysql-test/r/rpl_change_master.result -> mysql-test/suite/rpl/r/rpl_change_master.result
      mysql-test/suite/rpl/r/rpl_foreign_key_innodb.result:
        Rename: mysql-test/r/rpl_foreign_key_innodb.result -> mysql-test/suite/rpl/r/rpl_foreign_key_innodb.result
      mysql-test/suite/rpl/r/rpl_insert_select.result:
        Rename: mysql-test/r/rpl_insert_select.result -> mysql-test/suite/rpl/r/rpl_insert_select.result
      mysql-test/suite/rpl/r/rpl_mixed_ddl_dml.result:
        Rename: mysql-test/r/rpl_mixed_ddl_dml.result -> mysql-test/suite/rpl/r/rpl_mixed_ddl_dml.result
      mysql-test/suite/rpl/r/rpl_replicate_do.result:
        Rename: mysql-test/r/rpl_replicate_do.result -> mysql-test/suite/rpl/r/rpl_replicate_do.result
      mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result:
        Rename: mysql-test/r/rpl_row_basic_2myisam.result -> mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result
      mysql-test/suite/rpl/r/rpl_row_sp011.result:
        Rename: mysql-test/r/rpl_row_sp011.result -> mysql-test/suite/rpl/r/rpl_row_sp011.result
      mysql-test/suite/rpl/r/rpl_row_trig004.result:
        Rename: mysql-test/r/rpl_row_trig004.result -> mysql-test/suite/rpl/r/rpl_row_trig004.result
      mysql-test/suite/rpl/r/rpl_slave_status.result:
        Rename: mysql-test/r/rpl_slave_status.result -> mysql-test/suite/rpl/r/rpl_slave_status.result
      mysql-test/suite/rpl/r/rpl_stm_log.result:
        Rename: mysql-test/r/rpl_stm_log.result -> mysql-test/suite/rpl/r/rpl_stm_log.result
      mysql-test/suite/rpl/r/rpl_stm_max_relay_size.result:
        Rename: mysql-test/r/rpl_stm_max_relay_size.result -> mysql-test/suite/rpl/r/rpl_stm_max_relay_size.result
      mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result:
        Rename: mysql-test/r/rpl_switch_stm_row_mixed.result -> mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result
      mysql-test/suite/rpl/r/rpl_temp_table.result:
        Rename: mysql-test/r/rpl_temp_table.result -> mysql-test/suite/rpl/r/rpl_temp_table.result
      mysql-test/suite/rpl/r/rpl_timezone.result:
        Rename: mysql-test/r/rpl_timezone.result -> mysql-test/suite/rpl/r/rpl_timezone.result
      mysql-test/suite/rpl/t/rpl000017-slave.sh:
        Rename: mysql-test/t/rpl000017-slave.sh -> mysql-test/suite/rpl/t/rpl000017-slave.sh
      mysql-test/suite/rpl/t/rpl000018-slave.opt:
        Rename: mysql-test/t/rpl000018-slave.opt -> mysql-test/suite/rpl/t/rpl000018-slave.opt
      mysql-test/suite/rpl/t/rpl_auto_increment_11932.test:
        Rename: mysql-test/t/rpl_auto_increment_11932.test -> mysql-test/suite/rpl/t/rpl_auto_increment_11932.test
      mysql-test/suite/rpl/t/rpl_commit_after_flush.test:
        Rename: mysql-test/t/rpl_commit_after_flush.test -> mysql-test/suite/rpl/t/rpl_commit_after_flush.test
      mysql-test/suite/rpl/t/rpl_create_database-master.opt:
        Rename: mysql-test/t/rpl_create_database-master.opt -> mysql-test/suite/rpl/t/rpl_create_database-master.opt
      mysql-test/suite/rpl/t/rpl_deadlock_innodb-slave.opt:
        Rename: mysql-test/t/rpl_deadlock_innodb-slave.opt -> mysql-test/suite/rpl/t/rpl_deadlock_innodb-slave.opt
      mysql-test/suite/rpl/t/rpl_drop.test:
        Rename: mysql-test/t/rpl_drop.test -> mysql-test/suite/rpl/t/rpl_drop.test
      mysql-test/suite/rpl/t/rpl_empty_master_crash.test:
        Rename: mysql-test/t/rpl_empty_master_crash.test -> mysql-test/suite/rpl/t/rpl_empty_master_crash.test
      mysql-test/suite/rpl/t/rpl_flushlog_loop-slave.opt:
        Rename: mysql-test/t/rpl_flushlog_loop-slave.opt -> mysql-test/suite/rpl/t/rpl_flushlog_loop-slave.opt
      mysql-test/suite/rpl/t/rpl_ignore_table_update.test:
        Rename: mysql-test/t/rpl_ignore_table_update.test -> mysql-test/suite/rpl/t/rpl_ignore_table_update.test
      mysql-test/suite/rpl/t/rpl_innodb.test:
        Rename: mysql-test/t/rpl_innodb.test -> mysql-test/suite/rpl/t/rpl_innodb.test
      mysql-test/suite/rpl/t/rpl_known_bugs_detection.test:
        Rename: mysql-test/t/rpl_known_bugs_detection.test -> mysql-test/suite/rpl/t/rpl_known_bugs_detection.test
      mysql-test/suite/rpl/t/rpl_multi_update4-slave.opt:
        Rename: mysql-test/t/rpl_multi_update4-slave.opt -> mysql-test/suite/rpl/t/rpl_multi_update4-slave.opt
      mysql-test/suite/rpl/t/rpl_packet-master.opt:
        Rename: mysql-test/t/rpl_packet-master.opt -> mysql-test/suite/rpl/t/rpl_packet-master.opt
      mysql-test/suite/rpl/t/rpl_row_4_bytes-master.opt:
        Rename: mysql-test/t/rpl_row_4_bytes-master.opt -> mysql-test/suite/rpl/t/rpl_row_4_bytes-master.opt
      mysql-test/suite/rpl/t/rpl_row_basic_3innodb.test:
        Rename: mysql-test/t/rpl_row_basic_3innodb.test -> mysql-test/suite/rpl/t/rpl_row_basic_3innodb.test
      mysql-test/suite/rpl/t/rpl_row_func001.test:
        Rename: mysql-test/t/rpl_row_func001.test -> mysql-test/suite/rpl/t/rpl_row_func001.test
      mysql-test/suite/rpl/t/rpl_row_func003-slave.opt:
        Rename: mysql-test/t/rpl_row_func003-slave.opt -> mysql-test/suite/rpl/t/rpl_row_func003-slave.opt
      mysql-test/suite/rpl/t/rpl_row_until.test:
        Rename: mysql-test/t/rpl_row_until.test -> mysql-test/suite/rpl/t/rpl_row_until.test
      mysql-test/suite/rpl/t/rpl_set_charset.test:
        Rename: mysql-test/t/rpl_set_charset.test -> mysql-test/suite/rpl/t/rpl_set_charset.test
      mysql-test/suite/rpl/t/rpl_skip_error-slave.opt:
        Rename: mysql-test/t/rpl_skip_error-slave.opt -> mysql-test/suite/rpl/t/rpl_skip_error-slave.opt
      mysql-test/suite/rpl/t/rpl_slave_status.test:
        Rename: mysql-test/t/rpl_slave_status.test -> mysql-test/suite/rpl/t/rpl_slave_status.test
      mysql-test/suite/rpl/t/rpl_sp-master.opt:
        Rename: mysql-test/t/rpl_sp-master.opt -> mysql-test/suite/rpl/t/rpl_sp-master.opt
      mysql-test/suite/rpl/t/rpl_sp004.test:
        Rename: mysql-test/t/rpl_sp004.test -> mysql-test/suite/rpl/t/rpl_sp004.test
      mysql-test/suite/rpl/t/rpl_start_stop_slave.test:
        Rename: mysql-test/t/rpl_start_stop_slave.test -> mysql-test/suite/rpl/t/rpl_start_stop_slave.test
      mysql-test/suite/rpl/t/rpl_stm_flsh_tbls.test:
        Rename: mysql-test/t/rpl_stm_flsh_tbls.test -> mysql-test/suite/rpl/t/rpl_stm_flsh_tbls.test
      mysql-test/suite/rpl/t/rpl_stm_log.test:
        Rename: mysql-test/t/rpl_stm_log.test -> mysql-test/suite/rpl/t/rpl_stm_log.test
      mysql-test/suite/rpl/t/rpl_truncate_2myisam.test:
        Rename: mysql-test/t/rpl_truncate_2myisam.test -> mysql-test/suite/rpl/t/rpl_truncate_2myisam.test
      mysql-test/suite/rpl_ndb/r/rpl_ndb_UUID.result:
        Rename: mysql-test/r/rpl_ndb_UUID.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_UUID.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_insert_ignore.result:
        Rename: mysql-test/r/rpl_ndb_insert_ignore.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_insert_ignore.result
      mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test:
        Rename: mysql-test/t/rpl_ndb_circular.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_commit_afterflush.test:
        Rename: mysql-test/t/rpl_ndb_commit_afterflush.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_commit_afterflush.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_relayrotate.test:
        Rename: mysql-test/t/rpl_ndb_relayrotate.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_relayrotate.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_rep_ignore-slave.opt:
        Rename: mysql-test/t/rpl_ndb_rep_ignore-slave.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_rep_ignore-slave.opt
      mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result:
        Rename: mysql-test/r/binlog_stm_ctype_ucs.result -> mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result
      mysql-test/suite/binlog/t/binlog_stm_drop_tmp_tbl.test:
        Rename: mysql-test/t/binlog_stm_drop_tmp_tbl.test -> mysql-test/suite/binlog/t/binlog_stm_drop_tmp_tbl.test
      mysql-test/suite/binlog/t/binlog_stm_innodb_stat-master.opt:
        Rename: mysql-test/t/binlog_stm_innodb_stat-master.opt -> mysql-test/suite/binlog/t/binlog_stm_innodb_stat-master.opt
      mysql-test/suite/ndb/r/loaddata_autocom_ndb.result:
        Rename: mysql-test/r/loaddata_autocom_ndb.result -> mysql-test/suite/ndb/r/loaddata_autocom_ndb.result
      mysql-test/suite/ndb/r/ndb_autodiscover3.result:
        Rename: mysql-test/r/ndb_autodiscover3.result -> mysql-test/suite/ndb/r/ndb_autodiscover3.result
      mysql-test/suite/ndb/r/ndb_binlog_basic2.result:
        Rename: mysql-test/r/ndb_binlog_basic2.result -> mysql-test/suite/ndb/r/ndb_binlog_basic2.result
      mysql-test/suite/ndb/r/ndb_blob_partition.result:
        Rename: mysql-test/r/ndb_blob_partition.result -> mysql-test/suite/ndb/r/ndb_blob_partition.result
      mysql-test/suite/ndb/r/ndb_insert.result:
        Rename: mysql-test/r/ndb_insert.result -> mysql-test/suite/ndb/r/ndb_insert.result
      mysql-test/suite/ndb/r/ndb_partition_error2.result:
        Rename: mysql-test/r/ndb_partition_error2.result -> mysql-test/suite/ndb/r/ndb_partition_error2.result
      mysql-test/suite/ndb/r/ndb_partition_list.result:
        Rename: mysql-test/r/ndb_partition_list.result -> mysql-test/suite/ndb/r/ndb_partition_list.result
      mysql-test/suite/ndb/r/ndb_restore_print.result:
        Rename: mysql-test/r/ndb_restore_print.result -> mysql-test/suite/ndb/r/ndb_restore_print.result
      mysql-test/suite/ndb/r/ndb_transaction.result:
        Rename: mysql-test/r/ndb_transaction.result -> mysql-test/suite/ndb/r/ndb_transaction.result
      mysql-test/suite/ndb/r/partition_03ndb.result:
        Rename: mysql-test/r/partition_03ndb.result -> mysql-test/suite/ndb/r/partition_03ndb.result
      mysql-test/suite/ndb/t/loaddata_autocom_ndb.test:
        Rename: mysql-test/t/loaddata_autocom_ndb.test -> mysql-test/suite/ndb/t/loaddata_autocom_ndb.test
      mysql-test/suite/ndb/t/ndb_autodiscover3.test:
        Rename: mysql-test/t/ndb_autodiscover3.test -> mysql-test/suite/ndb/t/ndb_autodiscover3.test
      mysql-test/suite/ndb/t/ndb_config2.test:
        Rename: mysql-test/t/ndb_config2.test -> mysql-test/suite/ndb/t/ndb_config2.test
      mysql-test/suite/ndb/t/ndb_cursor.test:
        Rename: mysql-test/t/ndb_cursor.test -> mysql-test/suite/ndb/t/ndb_cursor.test
      mysql-test/suite/ndb/t/ndb_database.test:
        Rename: mysql-test/t/ndb_database.test -> mysql-test/suite/ndb/t/ndb_database.test
      mysql-test/suite/ndb/t/ndb_index_ordered.test:
        Rename: mysql-test/t/ndb_index_ordered.test -> mysql-test/suite/ndb/t/ndb_index_ordered.test
      mysql-test/suite/ndb/t/ndb_restore_partition-master.opt:
        Rename: mysql-test/t/ndb_restore_partition-master.opt -> mysql-test/suite/ndb/t/ndb_restore_partition-master.opt
      mysql-test/suite/rpl/r/rpl_000015.result:
        Rename: mysql-test/r/rpl_000015.result -> mysql-test/suite/rpl/r/rpl_000015.result
      mysql-test/suite/rpl/r/rpl_bit_npk.result:
        Rename: mysql-test/r/rpl_bit_npk.result -> mysql-test/suite/rpl/r/rpl_bit_npk.result
      mysql-test/suite/rpl/r/rpl_critical_errors.result:
        Rename: mysql-test/r/rpl_critical_errors.result -> mysql-test/suite/rpl/r/rpl_critical_errors.result
      mysql-test/suite/rpl/r/rpl_delete_no_where.result:
        Rename: mysql-test/r/rpl_delete_no_where.result -> mysql-test/suite/rpl/r/rpl_delete_no_where.result
      mysql-test/suite/rpl/r/rpl_do_grant.result:
        Rename: mysql-test/r/rpl_do_grant.result -> mysql-test/suite/rpl/r/rpl_do_grant.result
      mysql-test/suite/rpl/r/rpl_events.result:
        Rename: mysql-test/r/rpl_events.result -> mysql-test/suite/rpl/r/rpl_events.result
      mysql-test/suite/rpl/r/rpl_get_lock.result:
        Rename: mysql-test/r/rpl_get_lock.result -> mysql-test/suite/rpl/r/rpl_get_lock.result
      mysql-test/suite/rpl/r/rpl_incident.result:
        Rename: mysql-test/r/rpl_incident.result -> mysql-test/suite/rpl/r/rpl_incident.result
      mysql-test/suite/rpl/r/rpl_init_slave.result:
        Rename: mysql-test/r/rpl_init_slave.result -> mysql-test/suite/rpl/r/rpl_init_slave.result
      mysql-test/suite/rpl/r/rpl_insert.result:
        Rename: mysql-test/r/rpl_insert.result -> mysql-test/suite/rpl/r/rpl_insert.result
      mysql-test/suite/rpl/r/rpl_insert_id.result:
        Rename: mysql-test/r/rpl_insert_id.result -> mysql-test/suite/rpl/r/rpl_insert_id.result
      mysql-test/suite/rpl/r/rpl_loaddata_s.result:
        Rename: mysql-test/r/rpl_loaddata_s.result -> mysql-test/suite/rpl/r/rpl_loaddata_s.result
      mysql-test/suite/rpl/r/rpl_multi_update4.result:
        Rename: mysql-test/r/rpl_multi_update4.result -> mysql-test/suite/rpl/r/rpl_multi_update4.result
      mysql-test/suite/rpl/r/rpl_optimize.result:
        Rename: mysql-test/r/rpl_optimize.result -> mysql-test/suite/rpl/r/rpl_optimize.result
      mysql-test/suite/rpl/r/rpl_row_blob_innodb.result:
        Rename: mysql-test/r/rpl_row_blob_innodb.result -> mysql-test/suite/rpl/r/rpl_row_blob_innodb.result
      mysql-test/suite/rpl/r/rpl_row_charset.result:
        Rename: mysql-test/r/rpl_row_charset.result -> mysql-test/suite/rpl/r/rpl_row_charset.result
      mysql-test/suite/rpl/r/rpl_row_drop.result:
        Rename: mysql-test/r/rpl_row_drop.result -> mysql-test/suite/rpl/r/rpl_row_drop.result
      mysql-test/suite/rpl/r/rpl_row_sp001.result:
        Rename: mysql-test/r/rpl_row_sp001.result -> mysql-test/suite/rpl/r/rpl_row_sp001.result
      mysql-test/suite/rpl/r/rpl_row_sp006_InnoDB.result:
        Rename: mysql-test/r/rpl_row_sp006_InnoDB.result -> mysql-test/suite/rpl/r/rpl_row_sp006_InnoDB.result
      mysql-test/suite/rpl/r/rpl_row_sp012.result:
        Rename: mysql-test/r/rpl_row_sp012.result -> mysql-test/suite/rpl/r/rpl_row_sp012.result
      mysql-test/suite/rpl/r/rpl_row_stop_middle.result:
        Rename: mysql-test/r/rpl_row_stop_middle.result -> mysql-test/suite/rpl/r/rpl_row_stop_middle.result
      mysql-test/suite/rpl/r/rpl_sp_effects.result:
        Rename: mysql-test/r/rpl_sp_effects.result -> mysql-test/suite/rpl/r/rpl_sp_effects.result
      mysql-test/suite/rpl/r/rpl_stm_flsh_tbls.result:
        Rename: mysql-test/r/rpl_stm_flsh_tbls.result -> mysql-test/suite/rpl/r/rpl_stm_flsh_tbls.result
      mysql-test/suite/rpl/r/rpl_stm_mystery22.result:
        Rename: mysql-test/r/rpl_stm_mystery22.result -> mysql-test/suite/rpl/r/rpl_stm_mystery22.result
      mysql-test/suite/rpl/t/rpl000010.test:
        Rename: mysql-test/t/rpl000010.test -> mysql-test/suite/rpl/t/rpl000010.test
      mysql-test/suite/rpl/t/rpl000017.test:
        Rename: mysql-test/t/rpl000017.test -> mysql-test/suite/rpl/t/rpl000017.test
      mysql-test/suite/rpl/t/rpl_000015.slave-mi:
        Rename: mysql-test/t/rpl_000015.slave-mi -> mysql-test/suite/rpl/t/rpl_000015.slave-mi
      mysql-test/suite/rpl/t/rpl_EE_err.test:
        Rename: mysql-test/t/rpl_EE_err.test -> mysql-test/suite/rpl/t/rpl_EE_err.test
      mysql-test/suite/rpl/t/rpl_LD_INFILE.test:
        Rename: mysql-test/t/rpl_LD_INFILE.test -> mysql-test/suite/rpl/t/rpl_LD_INFILE.test
      mysql-test/suite/rpl/t/rpl_charset_sjis.test:
        Rename: mysql-test/t/rpl_charset_sjis.test -> mysql-test/suite/rpl/t/rpl_charset_sjis.test
      mysql-test/suite/rpl/t/rpl_create_database-slave.opt:
        Rename: mysql-test/t/rpl_create_database-slave.opt -> mysql-test/suite/rpl/t/rpl_create_database-slave.opt
      mysql-test/suite/rpl/t/rpl_err_ignoredtable.test:
        Rename: mysql-test/t/rpl_err_ignoredtable.test -> mysql-test/suite/rpl/t/rpl_err_ignoredtable.test
      mysql-test/suite/rpl/t/rpl_extraCol_innodb-master.opt:
        Rename: mysql-test/t/rpl_extraCol_innodb-master.opt -> mysql-test/suite/rpl/t/rpl_extraCol_innodb-master.opt
      mysql-test/suite/rpl/t/rpl_extraCol_myisam.test:
        Rename: mysql-test/t/rpl_extraCol_myisam.test -> mysql-test/suite/rpl/t/rpl_extraCol_myisam.test
      mysql-test/suite/rpl/t/rpl_failed_optimize.test:
        Rename: mysql-test/t/rpl_failed_optimize.test -> mysql-test/suite/rpl/t/rpl_failed_optimize.test
      mysql-test/suite/rpl/t/rpl_foreign_key_innodb-slave.opt:
        Rename: mysql-test/t/rpl_foreign_key_innodb-slave.opt -> mysql-test/suite/rpl/t/rpl_foreign_key_innodb-slave.opt
      mysql-test/suite/rpl/t/rpl_insert_id-slave.opt:
        Rename: mysql-test/t/rpl_insert_id-slave.opt -> mysql-test/suite/rpl/t/rpl_insert_id-slave.opt
      mysql-test/suite/rpl/t/rpl_load_table_from_master.test:
        Rename: mysql-test/t/rpl_load_table_from_master.test -> mysql-test/suite/rpl/t/rpl_load_table_from_master.test
      mysql-test/suite/rpl/t/rpl_loaddata.test:
        Rename: mysql-test/t/rpl_loaddata.test -> mysql-test/suite/rpl/t/rpl_loaddata.test
      mysql-test/suite/rpl/t/rpl_loaddata_s.test:
        Rename: mysql-test/t/rpl_loaddata_s.test -> mysql-test/suite/rpl/t/rpl_loaddata_s.test
      mysql-test/suite/rpl/t/rpl_master_pos_wait.test:
        Rename: mysql-test/t/rpl_master_pos_wait.test -> mysql-test/suite/rpl/t/rpl_master_pos_wait.test
      mysql-test/suite/rpl/t/rpl_misc_functions-slave.sh:
        Rename: mysql-test/t/rpl_misc_functions-slave.sh -> mysql-test/suite/rpl/t/rpl_misc_functions-slave.sh
      mysql-test/suite/rpl/t/rpl_multi_update2.test:
        Rename: mysql-test/t/rpl_multi_update2.test -> mysql-test/suite/rpl/t/rpl_multi_update2.test
      mysql-test/suite/rpl/t/rpl_packet.test:
        Rename: mysql-test/t/rpl_packet.test -> mysql-test/suite/rpl/t/rpl_packet.test
      mysql-test/suite/rpl/t/rpl_relay_space_innodb-master.opt:
        Rename: mysql-test/t/rpl_relay_space_innodb-master.opt -> mysql-test/suite/rpl/t/rpl_relay_space_innodb-master.opt
      mysql-test/suite/rpl/t/rpl_row_basic_11bugs-slave.opt:
        Rename: mysql-test/t/rpl_row_basic_11bugs-slave.opt -> mysql-test/suite/rpl/t/rpl_row_basic_11bugs-slave.opt
      mysql-test/suite/rpl/t/rpl_row_inexist_tbl-slave.opt:
        Rename: mysql-test/t/rpl_row_inexist_tbl-slave.opt -> mysql-test/suite/rpl/t/rpl_row_inexist_tbl-slave.opt
      mysql-test/suite/rpl/t/rpl_row_insert_delayed.test:
        Rename: mysql-test/t/rpl_row_insert_delayed.test -> mysql-test/suite/rpl/t/rpl_row_insert_delayed.test
      mysql-test/suite/rpl/t/rpl_row_log_innodb-slave.opt:
        Rename: mysql-test/t/rpl_row_log_innodb-slave.opt -> mysql-test/suite/rpl/t/rpl_row_log_innodb-slave.opt
      mysql-test/suite/rpl/t/rpl_row_max_relay_size.test:
        Rename: mysql-test/t/rpl_row_max_relay_size.test -> mysql-test/suite/rpl/t/rpl_row_max_relay_size.test
      mysql-test/suite/rpl/t/rpl_row_sp002_innodb.test:
        Rename: mysql-test/t/rpl_row_sp002_innodb.test -> mysql-test/suite/rpl/t/rpl_row_sp002_innodb.test
      mysql-test/suite/rpl/t/rpl_row_sp003-slave.opt:
        Rename: mysql-test/t/rpl_row_sp003-slave.opt -> mysql-test/suite/rpl/t/rpl_row_sp003-slave.opt
      mysql-test/suite/rpl/t/rpl_row_sp006_InnoDB-slave.opt:
        Rename: mysql-test/t/rpl_row_sp006_InnoDB-slave.opt -> mysql-test/suite/rpl/t/rpl_row_sp006_InnoDB-slave.opt
      mysql-test/suite/rpl/t/rpl_row_sp012.test:
        Rename: mysql-test/t/rpl_row_sp012.test -> mysql-test/suite/rpl/t/rpl_row_sp012.test
      mysql-test/suite/rpl/t/rpl_row_stop_middle_update.test:
        Rename: mysql-test/t/rpl_row_stop_middle_update.test -> mysql-test/suite/rpl/t/rpl_row_stop_middle_update.test
      mysql-test/suite/rpl/t/rpl_row_tabledefs_2myisam.test:
        Rename: mysql-test/t/rpl_row_tabledefs_2myisam.test -> mysql-test/suite/rpl/t/rpl_row_tabledefs_2myisam.test
      mysql-test/suite/rpl/t/rpl_row_trig003.test:
        Rename: mysql-test/t/rpl_row_trig003.test -> mysql-test/suite/rpl/t/rpl_row_trig003.test
      mysql-test/suite/rpl/t/rpl_server_id2.test:
        Rename: mysql-test/t/rpl_server_id2.test -> mysql-test/suite/rpl/t/rpl_server_id2.test
      mysql-test/suite/rpl/t/rpl_sporadic_master.test:
        Rename: mysql-test/t/rpl_sporadic_master.test -> mysql-test/suite/rpl/t/rpl_sporadic_master.test
      mysql-test/suite/rpl/t/rpl_stm_000001.test:
        Rename: mysql-test/t/rpl_stm_000001.test -> mysql-test/suite/rpl/t/rpl_stm_000001.test
      mysql-test/suite/rpl/t/rpl_stm_reset_slave.test:
        Rename: mysql-test/t/rpl_stm_reset_slave.test -> mysql-test/suite/rpl/t/rpl_stm_reset_slave.test
      mysql-test/suite/rpl/t/rpl_temp_table.test:
        Rename: mysql-test/t/rpl_temp_table.test -> mysql-test/suite/rpl/t/rpl_temp_table.test
      mysql-test/suite/rpl/t/rpl_timezone-slave.opt:
        Rename: mysql-test/t/rpl_timezone-slave.opt -> mysql-test/suite/rpl/t/rpl_timezone-slave.opt
      mysql-test/suite/rpl_ndb/r/rpl_ndb_2innodb.result:
        Rename: mysql-test/r/rpl_ndb_2innodb.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_2innodb.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result:
        Rename: mysql-test/r/rpl_ndb_circular.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_innodb_trans.result:
        Rename: mysql-test/r/rpl_ndb_innodb_trans.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_innodb_trans.result
      mysql-test/suite/rpl_ndb/t/rpl_ndb_blob2.test:
        Rename: mysql-test/t/rpl_ndb_blob2.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_blob2.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_do_table-slave.opt:
        Rename: mysql-test/t/rpl_ndb_do_table-slave.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_do_table-slave.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb.test:
        Rename: mysql-test/t/rpl_ndb_innodb2ndb.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_insert_ignore.test:
        Rename: mysql-test/t/rpl_ndb_insert_ignore.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_insert_ignore.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update3.test:
        Rename: mysql-test/t/rpl_ndb_multi_update3.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update3.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb.test:
        Rename: mysql-test/t/rpl_ndb_myisam2ndb.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb.test
      mysql-test/suite/binlog/r/binlog_stm_drop_tmp_tbl.result:
        Rename: mysql-test/r/binlog_stm_drop_tmp_tbl.result -> mysql-test/suite/binlog/r/binlog_stm_drop_tmp_tbl.result
      mysql-test/suite/binlog/r/binlog_stm_innodb_stat.result:
        Rename: mysql-test/r/binlog_stm_innodb_stat.result -> mysql-test/suite/binlog/r/binlog_stm_innodb_stat.result
      mysql-test/suite/binlog/t/binlog_stm_blackhole.test:
        Rename: mysql-test/t/binlog_stm_blackhole.test -> mysql-test/suite/binlog/t/binlog_stm_blackhole.test
      mysql-test/suite/binlog/t/binlog_stm_insert_select.test:
        Rename: mysql-test/t/binlog_stm_insert_select.test -> mysql-test/suite/binlog/t/binlog_stm_insert_select.test
      mysql-test/suite/ndb/r/ndb_binlog_discover.result:
        Rename: mysql-test/r/ndb_binlog_discover.result -> mysql-test/suite/ndb/r/ndb_binlog_discover.result
      mysql-test/suite/ndb/r/ndb_bitfield.result:
        Rename: mysql-test/r/ndb_bitfield.result -> mysql-test/suite/ndb/r/ndb_bitfield.result
      mysql-test/suite/ndb/r/ndb_minmax.result:
        Rename: mysql-test/r/ndb_minmax.result -> mysql-test/suite/ndb/r/ndb_minmax.result
      mysql-test/suite/ndb/r/ndb_single_user.result:
        Rename: mysql-test/r/ndb_single_user.result -> mysql-test/suite/ndb/r/ndb_single_user.result
      mysql-test/suite/ndb/r/ndb_subquery.result:
        Rename: mysql-test/r/ndb_subquery.result -> mysql-test/suite/ndb/r/ndb_subquery.result
      mysql-test/suite/ndb/t/ndb_binlog_log_bin.test:
        Rename: mysql-test/t/ndb_binlog_log_bin.test -> mysql-test/suite/ndb/t/ndb_binlog_log_bin.test
      mysql-test/suite/ndb/t/ndb_config.test:
        Rename: mysql-test/t/ndb_config.test -> mysql-test/suite/ndb/t/ndb_config.test
      mysql-test/suite/ndb/t/ndb_replace.test:
        Rename: mysql-test/t/ndb_replace.test -> mysql-test/suite/ndb/t/ndb_replace.test
      mysql-test/suite/ndb/t/ndb_transaction.test:
        Rename: mysql-test/t/ndb_transaction.test -> mysql-test/suite/ndb/t/ndb_transaction.test
      mysql-test/suite/ndb/t/ndb_trigger.test:
        Rename: mysql-test/t/ndb_trigger.test -> mysql-test/suite/ndb/t/ndb_trigger.test
      mysql-test/suite/ndb/t/ndb_view.test:
        Rename: mysql-test/t/ndb_view.test -> mysql-test/suite/ndb/t/ndb_view.test
      mysql-test/suite/rpl/r/rpl000011.result:
        Rename: mysql-test/r/rpl000011.result -> mysql-test/suite/rpl/r/rpl000011.result
      mysql-test/suite/rpl/r/rpl_free_items.result:
        Rename: mysql-test/r/rpl_free_items.result -> mysql-test/suite/rpl/r/rpl_free_items.result
      mysql-test/suite/rpl/r/rpl_ignore_revoke.result:
        Rename: mysql-test/r/rpl_ignore_revoke.result -> mysql-test/suite/rpl/r/rpl_ignore_revoke.result
      mysql-test/suite/rpl/r/rpl_innodb.result:
        Rename: mysql-test/r/rpl_innodb.result -> mysql-test/suite/rpl/r/rpl_innodb.result
      mysql-test/suite/rpl/r/rpl_loadfile.result:
        Rename: mysql-test/r/rpl_loadfile.result -> mysql-test/suite/rpl/r/rpl_loadfile.result
      mysql-test/suite/rpl/r/rpl_multi_update.result:
        Rename: mysql-test/r/rpl_multi_update.result -> mysql-test/suite/rpl/r/rpl_multi_update.result
      mysql-test/suite/rpl/r/rpl_ps.result:
        Rename: mysql-test/r/rpl_ps.result -> mysql-test/suite/rpl/r/rpl_ps.result
      mysql-test/suite/rpl/r/rpl_read_only.result:
        Rename: mysql-test/r/rpl_read_only.result -> mysql-test/suite/rpl/r/rpl_read_only.result
      mysql-test/suite/rpl/r/rpl_replicate_ignore_db.result:
        Rename: mysql-test/r/rpl_replicate_ignore_db.result -> mysql-test/suite/rpl/r/rpl_replicate_ignore_db.result
      mysql-test/suite/rpl/r/rpl_row_4_bytes.result:
        Rename: mysql-test/r/rpl_row_4_bytes.result -> mysql-test/suite/rpl/r/rpl_row_4_bytes.result
      mysql-test/suite/rpl/r/rpl_row_USER.result:
        Rename: mysql-test/r/rpl_row_USER.result -> mysql-test/suite/rpl/r/rpl_row_USER.result
      mysql-test/suite/rpl/r/rpl_row_UUID.result:
        Rename: mysql-test/r/rpl_row_UUID.result -> mysql-test/suite/rpl/r/rpl_row_UUID.result
      mysql-test/suite/rpl/r/rpl_row_blob_myisam.result:
        Rename: mysql-test/r/rpl_row_blob_myisam.result -> mysql-test/suite/rpl/r/rpl_row_blob_myisam.result
      mysql-test/suite/rpl/r/rpl_row_err_ignoredtable.result:
        Rename: mysql-test/r/rpl_row_err_ignoredtable.result -> mysql-test/suite/rpl/r/rpl_row_err_ignoredtable.result
      mysql-test/suite/rpl/r/rpl_row_sp002_innodb.result:
        Rename: mysql-test/r/rpl_row_sp002_innodb.result -> mysql-test/suite/rpl/r/rpl_row_sp002_innodb.result
      mysql-test/suite/rpl/r/rpl_row_sp007_innodb.result:
        Rename: mysql-test/r/rpl_row_sp007_innodb.result -> mysql-test/suite/rpl/r/rpl_row_sp007_innodb.result
      mysql-test/suite/rpl/r/rpl_ssl1.result:
        Rename: mysql-test/r/rpl_ssl1.result -> mysql-test/suite/rpl/r/rpl_ssl1.result
      mysql-test/suite/rpl/r/rpl_stm_000001.result:
        Rename: mysql-test/r/rpl_stm_000001.result -> mysql-test/suite/rpl/r/rpl_stm_000001.result
      mysql-test/suite/rpl/r/rpl_truncate_2myisam.result:
        Rename: mysql-test/r/rpl_truncate_2myisam.result -> mysql-test/suite/rpl/r/rpl_truncate_2myisam.result
      mysql-test/suite/rpl/t/rpl000018-master.opt:
        Rename: mysql-test/t/rpl000018-master.opt -> mysql-test/suite/rpl/t/rpl000018-master.opt
      mysql-test/suite/rpl/t/rpl_000015.test:
        Rename: mysql-test/t/rpl_000015.test -> mysql-test/suite/rpl/t/rpl_000015.test
      mysql-test/suite/rpl/t/rpl_drop_temp.test:
        Rename: mysql-test/t/rpl_drop_temp.test -> mysql-test/suite/rpl/t/rpl_drop_temp.test
      mysql-test/suite/rpl/t/rpl_err_ignoredtable-slave.opt:
        Rename: mysql-test/t/rpl_err_ignoredtable-slave.opt -> mysql-test/suite/rpl/t/rpl_err_ignoredtable-slave.opt
      mysql-test/suite/rpl/t/rpl_failed_optimize-master.opt:
        Rename: mysql-test/t/rpl_failed_optimize-master.opt -> mysql-test/suite/rpl/t/rpl_failed_optimize-master.opt
      mysql-test/suite/rpl/t/rpl_foreign_key_innodb.test:
        Rename: mysql-test/t/rpl_foreign_key_innodb.test -> mysql-test/suite/rpl/t/rpl_foreign_key_innodb.test
      mysql-test/suite/rpl/t/rpl_ignore_table.test:
        Rename: mysql-test/t/rpl_ignore_table.test -> mysql-test/suite/rpl/t/rpl_ignore_table.test
      mysql-test/suite/rpl/t/rpl_ignore_table_update-slave.opt:
        Rename: mysql-test/t/rpl_ignore_table_update-slave.opt -> mysql-test/suite/rpl/t/rpl_ignore_table_update-slave.opt
      mysql-test/suite/rpl/t/rpl_incident-master.opt:
        Rename: mysql-test/t/rpl_incident-master.opt -> mysql-test/suite/rpl/t/rpl_incident-master.opt
      mysql-test/suite/rpl/t/rpl_insert_id_pk-slave.opt:
        Rename: mysql-test/t/rpl_insert_id_pk-slave.opt -> mysql-test/suite/rpl/t/rpl_insert_id_pk-slave.opt
      mysql-test/suite/rpl/t/rpl_loaddata_m-master.opt:
        Rename: mysql-test/t/rpl_loaddata_m-master.opt -> mysql-test/suite/rpl/t/rpl_loaddata_m-master.opt
      mysql-test/suite/rpl/t/rpl_loaddatalocal.test:
        Rename: mysql-test/t/rpl_loaddatalocal.test -> mysql-test/suite/rpl/t/rpl_loaddatalocal.test
      mysql-test/suite/rpl/t/rpl_misc_functions.test:
        Rename: mysql-test/t/rpl_misc_functions.test -> mysql-test/suite/rpl/t/rpl_misc_functions.test
      mysql-test/suite/rpl/t/rpl_multi_update.test:
        Rename: mysql-test/t/rpl_multi_update.test -> mysql-test/suite/rpl/t/rpl_multi_update.test
      mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test:
        Rename: mysql-test/t/rpl_row_basic_11bugs.test -> mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test
      mysql-test/suite/rpl/t/rpl_row_blob_innodb-slave.opt:
        Rename: mysql-test/t/rpl_row_blob_innodb-slave.opt -> mysql-test/suite/rpl/t/rpl_row_blob_innodb-slave.opt
      mysql-test/suite/rpl/t/rpl_row_log-master.opt:
        Rename: mysql-test/t/rpl_row_log-master.opt -> mysql-test/suite/rpl/t/rpl_row_log-master.opt
      mysql-test/suite/rpl/t/rpl_row_sp001.test:
        Rename: mysql-test/t/rpl_row_sp001.test -> mysql-test/suite/rpl/t/rpl_row_sp001.test
      mysql-test/suite/rpl/t/rpl_row_sp002_innodb-master.opt:
        Rename: mysql-test/t/rpl_row_sp002_innodb-master.opt -> mysql-test/suite/rpl/t/rpl_row_sp002_innodb-master.opt
      mysql-test/suite/rpl/t/rpl_row_sp008.test:
        Rename: mysql-test/t/rpl_row_sp008.test -> mysql-test/suite/rpl/t/rpl_row_sp008.test
      mysql-test/suite/rpl/t/rpl_sp-slave.opt:
        Rename: mysql-test/t/rpl_sp-slave.opt -> mysql-test/suite/rpl/t/rpl_sp-slave.opt
      mysql-test/suite/rpl/t/rpl_stm_000001-slave.opt:
        Rename: mysql-test/t/rpl_stm_000001-slave.opt -> mysql-test/suite/rpl/t/rpl_stm_000001-slave.opt
      mysql-test/suite/rpl/t/rpl_timezone.test:
        Rename: mysql-test/t/rpl_timezone.test -> mysql-test/suite/rpl/t/rpl_timezone.test
      mysql-test/suite/rpl_ndb/r/rpl_ndb_2myisam.result:
        Rename: mysql-test/r/rpl_ndb_2myisam.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_2myisam.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_basic.result:
        Rename: mysql-test/r/rpl_ndb_basic.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_basic.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result:
        Rename: mysql-test/r/rpl_ndb_extraCol.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_idempotent.result:
        Rename: mysql-test/r/rpl_ndb_idempotent.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_idempotent.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result:
        Rename: mysql-test/r/rpl_ndb_log.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_row_001.result:
        Rename: mysql-test/r/rpl_ndb_row_001.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_row_001.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result:
        Rename: mysql-test/r/rpl_ndb_stm_innodb.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result
      mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb-slave.opt:
        Rename: mysql-test/t/rpl_ndb_2innodb-slave.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb-slave.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_blob.test:
        Rename: mysql-test/t/rpl_ndb_blob.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_blob.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_advance.test:
        Rename: mysql-test/t/rpl_ndb_dd_advance.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_advance.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb_trans-slave.opt:
        Rename: mysql-test/t/rpl_ndb_innodb_trans-slave.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb_trans-slave.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb-slave.opt:
        Rename: mysql-test/t/rpl_ndb_myisam2ndb-slave.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb-slave.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_rep_ignore.test:
        Rename: mysql-test/t/rpl_ndb_rep_ignore.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_rep_ignore.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb.test:
        Rename: mysql-test/t/rpl_ndb_stm_innodb.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb.test
      mysql-test/suite/rpl_ndb/t/rpl_ndbapi_multi.test:
        Rename: mysql-test/t/rpl_ndbapi_multi.test -> mysql-test/suite/rpl_ndb/t/rpl_ndbapi_multi.test
      mysql-test/suite/binlog/r/binlog_killed.result:
        Rename: mysql-test/r/binlog_killed.result -> mysql-test/suite/binlog/r/binlog_killed.result
      mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result:
        Rename: mysql-test/r/binlog_row_ctype_ucs.result -> mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result
      mysql-test/suite/binlog/r/binlog_stm_binlog.result:
        Rename: mysql-test/r/binlog_stm_binlog.result -> mysql-test/suite/binlog/r/binlog_stm_binlog.result
      mysql-test/suite/binlog/t/binlog_row_ctype_ucs.test:
        Rename: mysql-test/t/binlog_row_ctype_ucs.test -> mysql-test/suite/binlog/t/binlog_row_ctype_ucs.test
      mysql-test/suite/binlog/t/binlog_stm_innodb_stat.test:
        Rename: mysql-test/t/binlog_stm_innodb_stat.test -> mysql-test/suite/binlog/t/binlog_stm_innodb_stat.test
      mysql-test/suite/binlog/t/binlog_stm_ps.test:
        Rename: mysql-test/t/binlog_stm_ps.test -> mysql-test/suite/binlog/t/binlog_stm_ps.test
      mysql-test/suite/ndb/r/ndb_cache.result:
        Rename: mysql-test/r/ndb_cache.result -> mysql-test/suite/ndb/r/ndb_cache.result
      mysql-test/suite/ndb/r/ndb_charset.result:
        Rename: mysql-test/r/ndb_charset.result -> mysql-test/suite/ndb/r/ndb_charset.result
      mysql-test/suite/ndb/r/ndb_config.result:
        Rename: mysql-test/r/ndb_config.result -> mysql-test/suite/ndb/r/ndb_config.result
      mysql-test/suite/ndb/r/ndb_dd_disk2memory.result:
        Rename: mysql-test/r/ndb_dd_disk2memory.result -> mysql-test/suite/ndb/r/ndb_dd_disk2memory.result
      mysql-test/suite/ndb/r/ndb_index.result:
        Rename: mysql-test/r/ndb_index.result -> mysql-test/suite/ndb/r/ndb_index.result
      mysql-test/suite/ndb/r/ndb_partition_key.result:
        Rename: mysql-test/r/ndb_partition_key.result -> mysql-test/suite/ndb/r/ndb_partition_key.result
      mysql-test/suite/ndb/r/strict_autoinc_5ndb.result:
        Rename: mysql-test/r/strict_autoinc_5ndb.result -> mysql-test/suite/ndb/r/strict_autoinc_5ndb.result
      mysql-test/suite/ndb/t/ndb_backup_print.test:
        Rename: mysql-test/t/ndb_backup_print.test -> mysql-test/suite/ndb/t/ndb_backup_print.test
      mysql-test/suite/ndb/t/ndb_binlog_basic2.test:
        Rename: mysql-test/t/ndb_binlog_basic2.test -> mysql-test/suite/ndb/t/ndb_binlog_basic2.test
      mysql-test/suite/ndb/t/ndb_binlog_ignore_db.test:
        Rename: mysql-test/t/ndb_binlog_ignore_db.test -> mysql-test/suite/ndb/t/ndb_binlog_ignore_db.test
      mysql-test/suite/ndb/t/ndb_insert.test:
        Rename: mysql-test/t/ndb_insert.test -> mysql-test/suite/ndb/t/ndb_insert.test
      mysql-test/suite/ndb/t/ndb_load.test:
        Rename: mysql-test/t/ndb_load.test -> mysql-test/suite/ndb/t/ndb_load.test
      mysql-test/suite/ndb/t/ndb_multi.test:
        Rename: mysql-test/t/ndb_multi.test -> mysql-test/suite/ndb/t/ndb_multi.test
      mysql-test/suite/ndb/t/ndb_partition_error.test:
        Rename: mysql-test/t/ndb_partition_error.test -> mysql-test/suite/ndb/t/ndb_partition_error.test
      mysql-test/suite/ndb/t/ndb_partition_error2.test:
        Rename: mysql-test/t/ndb_partition_error2.test -> mysql-test/suite/ndb/t/ndb_partition_error2.test
      mysql-test/suite/ndb/t/ndb_partition_key.test:
        Rename: mysql-test/t/ndb_partition_key.test -> mysql-test/suite/ndb/t/ndb_partition_key.test
      mysql-test/suite/ndb/t/ndb_rename.test:
        Rename: mysql-test/t/ndb_rename.test -> mysql-test/suite/ndb/t/ndb_rename.test
      mysql-test/suite/ndb/t/ndb_single_user.test:
        Rename: mysql-test/t/ndb_single_user.test -> mysql-test/suite/ndb/t/ndb_single_user.test
      mysql-test/suite/rpl/r/rpl000010.result:
        Rename: mysql-test/r/rpl000010.result -> mysql-test/suite/rpl/r/rpl000010.result
      mysql-test/suite/rpl/r/rpl_EE_err.result:
        Rename: mysql-test/r/rpl_EE_err.result -> mysql-test/suite/rpl/r/rpl_EE_err.result
      mysql-test/suite/rpl/r/rpl_ddl.result:
        Rename: mysql-test/r/rpl_ddl.result -> mysql-test/suite/rpl/r/rpl_ddl.result
      mysql-test/suite/rpl/r/rpl_deadlock_innodb.result:
        Rename: mysql-test/r/rpl_deadlock_innodb.result -> mysql-test/suite/rpl/r/rpl_deadlock_innodb.result
      mysql-test/suite/rpl/r/rpl_drop.result:
        Rename: mysql-test/r/rpl_drop.result -> mysql-test/suite/rpl/r/rpl_drop.result
      mysql-test/suite/rpl/r/rpl_drop_temp.result:
        Rename: mysql-test/r/rpl_drop_temp.result -> mysql-test/suite/rpl/r/rpl_drop_temp.result
      mysql-test/suite/rpl/r/rpl_many_optimize.result:
        Rename: mysql-test/r/rpl_many_optimize.result -> mysql-test/suite/rpl/r/rpl_many_optimize.result
      mysql-test/suite/rpl/r/rpl_multi_engine.result:
        Rename: mysql-test/r/rpl_multi_engine.result -> mysql-test/suite/rpl/r/rpl_multi_engine.result
      mysql-test/suite/rpl/r/rpl_packet.result:
        Rename: mysql-test/r/rpl_packet.result -> mysql-test/suite/rpl/r/rpl_packet.result
      mysql-test/suite/rpl/r/rpl_relayrotate.result:
        Rename: mysql-test/r/rpl_relayrotate.result -> mysql-test/suite/rpl/r/rpl_relayrotate.result
      mysql-test/suite/rpl/r/rpl_row_basic_8partition.result:
        Rename: mysql-test/r/rpl_row_basic_8partition.result -> mysql-test/suite/rpl/r/rpl_row_basic_8partition.result
      mysql-test/suite/rpl/r/rpl_row_log.result:
        Rename: mysql-test/r/rpl_row_log.result -> mysql-test/suite/rpl/r/rpl_row_log.result
      mysql-test/suite/rpl/r/rpl_row_sp003.result:
        Rename: mysql-test/r/rpl_row_sp003.result -> mysql-test/suite/rpl/r/rpl_row_sp003.result
      mysql-test/suite/rpl/r/rpl_row_view01.result:
        Rename: mysql-test/r/rpl_row_view01.result -> mysql-test/suite/rpl/r/rpl_row_view01.result
      mysql-test/suite/rpl/r/rpl_session_var.result:
        Rename: mysql-test/r/rpl_session_var.result -> mysql-test/suite/rpl/r/rpl_session_var.result
      mysql-test/suite/rpl/r/rpl_sporadic_master.result:
        Rename: mysql-test/r/rpl_sporadic_master.result -> mysql-test/suite/rpl/r/rpl_sporadic_master.result
      mysql-test/suite/rpl/r/rpl_udf.result:
        Rename: mysql-test/r/rpl_udf.result -> mysql-test/suite/rpl/r/rpl_udf.result
      mysql-test/suite/rpl/r/rpl_variables.result:
        Rename: mysql-test/r/rpl_variables.result -> mysql-test/suite/rpl/r/rpl_variables.result
      mysql-test/suite/rpl/t/rpl_auto_increment-slave.opt:
        Rename: mysql-test/t/rpl_auto_increment-slave.opt -> mysql-test/suite/rpl/t/rpl_auto_increment-slave.opt
      mysql-test/suite/rpl/t/rpl_auto_increment.test:
        Rename: mysql-test/t/rpl_auto_increment.test -> mysql-test/suite/rpl/t/rpl_auto_increment.test
      mysql-test/suite/rpl/t/rpl_bit.test:
        Rename: mysql-test/t/rpl_bit.test -> mysql-test/suite/rpl/t/rpl_bit.test
      mysql-test/suite/rpl/t/rpl_critical_errors.test:
        Rename: mysql-test/t/rpl_critical_errors.test -> mysql-test/suite/rpl/t/rpl_critical_errors.test
      mysql-test/suite/rpl/t/rpl_ddl.test:
        Rename: mysql-test/t/rpl_ddl.test -> mysql-test/suite/rpl/t/rpl_ddl.test
      mysql-test/suite/rpl/t/rpl_do_grant.test:
        Rename: mysql-test/t/rpl_do_grant.test -> mysql-test/suite/rpl/t/rpl_do_grant.test
      mysql-test/suite/rpl/t/rpl_extraCol_innodb-slave.opt:
        Rename: mysql-test/t/rpl_extraCol_innodb-slave.opt -> mysql-test/suite/rpl/t/rpl_extraCol_innodb-slave.opt
      mysql-test/suite/rpl/t/rpl_ignore_revoke.test:
        Rename: mysql-test/t/rpl_ignore_revoke.test -> mysql-test/suite/rpl/t/rpl_ignore_revoke.test
      mysql-test/suite/rpl/t/rpl_init_slave-slave.opt:
        Rename: mysql-test/t/rpl_init_slave-slave.opt -> mysql-test/suite/rpl/t/rpl_init_slave-slave.opt
      mysql-test/suite/rpl/t/rpl_log_pos.test:
        Rename: mysql-test/t/rpl_log_pos.test -> mysql-test/suite/rpl/t/rpl_log_pos.test
      mysql-test/suite/rpl/t/rpl_multi_delete2-slave.opt:
        Rename: mysql-test/t/rpl_multi_delete2-slave.opt -> mysql-test/suite/rpl/t/rpl_multi_delete2-slave.opt
      mysql-test/suite/rpl/t/rpl_multi_update3.test:
        Rename: mysql-test/t/rpl_multi_update3.test -> mysql-test/suite/rpl/t/rpl_multi_update3.test
      mysql-test/suite/rpl/t/rpl_optimize.test:
        Rename: mysql-test/t/rpl_optimize.test -> mysql-test/suite/rpl/t/rpl_optimize.test
      mysql-test/suite/rpl/t/rpl_rbr_to_sbr.test:
        Rename: mysql-test/t/rpl_rbr_to_sbr.test -> mysql-test/suite/rpl/t/rpl_rbr_to_sbr.test
      mysql-test/suite/rpl/t/rpl_replicate_do-slave.opt:
        Rename: mysql-test/t/rpl_replicate_do-slave.opt -> mysql-test/suite/rpl/t/rpl_replicate_do-slave.opt
      mysql-test/suite/rpl/t/rpl_rewrt_db-slave.opt:
        Rename: mysql-test/t/rpl_rewrt_db-slave.opt -> mysql-test/suite/rpl/t/rpl_rewrt_db-slave.opt
      mysql-test/suite/rpl/t/rpl_rotate_logs-slave.sh:
        Rename: mysql-test/t/rpl_rotate_logs-slave.sh -> mysql-test/suite/rpl/t/rpl_rotate_logs-slave.sh
      mysql-test/suite/rpl/t/rpl_row_UUID.test:
        Rename: mysql-test/t/rpl_row_UUID.test -> mysql-test/suite/rpl/t/rpl_row_UUID.test
      mysql-test/suite/rpl/t/rpl_row_blob_innodb.test:
        Rename: mysql-test/t/rpl_row_blob_innodb.test -> mysql-test/suite/rpl/t/rpl_row_blob_innodb.test
      mysql-test/suite/rpl/t/rpl_row_create_table.test:
        Rename: mysql-test/t/rpl_row_create_table.test -> mysql-test/suite/rpl/t/rpl_row_create_table.test
      mysql-test/suite/rpl/t/rpl_row_func002.test:
        Rename: mysql-test/t/rpl_row_func002.test -> mysql-test/suite/rpl/t/rpl_row_func002.test
      mysql-test/suite/rpl/t/rpl_row_log.test:
        Rename: mysql-test/t/rpl_row_log.test -> mysql-test/suite/rpl/t/rpl_row_log.test
      mysql-test/suite/rpl/t/rpl_row_log_innodb-master.opt:
        Rename: mysql-test/t/rpl_row_log_innodb-master.opt -> mysql-test/suite/rpl/t/rpl_row_log_innodb-master.opt
      mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test:
        Rename: mysql-test/t/rpl_row_mysqlbinlog.test -> mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test
      mysql-test/suite/rpl/t/rpl_row_sp005.test:
        Rename: mysql-test/t/rpl_row_sp005.test -> mysql-test/suite/rpl/t/rpl_row_sp005.test
      mysql-test/suite/rpl/t/rpl_server_id2-slave.opt:
        Rename: mysql-test/t/rpl_server_id2-slave.opt -> mysql-test/suite/rpl/t/rpl_server_id2-slave.opt
      mysql-test/suite/rpl/t/rpl_sp.test:
        Rename: mysql-test/t/rpl_sp.test -> mysql-test/suite/rpl/t/rpl_sp.test
      mysql-test/suite/rpl/t/rpl_ssl.test:
        Rename: mysql-test/t/rpl_ssl.test -> mysql-test/suite/rpl/t/rpl_ssl.test
      mysql-test/suite/rpl/t/rpl_stm_EE_err2.test:
        Rename: mysql-test/t/rpl_stm_EE_err2.test -> mysql-test/suite/rpl/t/rpl_stm_EE_err2.test
      mysql-test/suite/rpl/t/rpl_stm_multi_query.test:
        Rename: mysql-test/t/rpl_stm_multi_query.test -> mysql-test/suite/rpl/t/rpl_stm_multi_query.test
      mysql-test/suite/rpl/t/rpl_udf-master.opt:
        Rename: mysql-test/t/rpl_udf-master.opt -> mysql-test/suite/rpl/t/rpl_udf-master.opt
      mysql-test/suite/rpl/t/rpl_udf.test:
        Rename: mysql-test/t/rpl_udf.test -> mysql-test/suite/rpl/t/rpl_udf.test
      mysql-test/suite/rpl/t/rpl_user_variables.test:
        Rename: mysql-test/t/rpl_user_variables.test -> mysql-test/suite/rpl/t/rpl_user_variables.test
      mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_basic.result:
        Rename: mysql-test/r/rpl_ndb_dd_basic.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_basic.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_ddl.result:
        Rename: mysql-test/r/rpl_ndb_ddl.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_ddl.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_do_table.result:
        Rename: mysql-test/r/rpl_ndb_do_table.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_do_table.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_func003.result:
        Rename: mysql-test/r/rpl_ndb_func003.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_func003.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_load.result:
        Rename: mysql-test/r/rpl_ndb_load.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_load.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_multi_update2.result:
        Rename: mysql-test/r/rpl_ndb_multi_update2.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_multi_update2.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_multi_update3.result:
        Rename: mysql-test/r/rpl_ndb_multi_update3.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_multi_update3.result
      mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result:
        Rename: mysql-test/r/rpl_row_basic_7ndb.result -> mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result
      mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam-master.opt:
        Rename: mysql-test/t/rpl_ndb_2myisam-master.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam-master.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_auto_inc.test:
        Rename: mysql-test/t/rpl_ndb_auto_inc.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_auto_inc.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_basic.test:
        Rename: mysql-test/t/rpl_ndb_basic.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_basic.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions.test:
        Rename: mysql-test/t/rpl_ndb_dd_partitions.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_log.test:
        Rename: mysql-test/t/rpl_ndb_log.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_log.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb-master.opt:
        Rename: mysql-test/t/rpl_ndb_myisam2ndb-master.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb-master.opt
      mysql-test/suite/rpl_ndb/t/rpl_row_basic_7ndb.test:
        Rename: mysql-test/t/rpl_row_basic_7ndb.test -> mysql-test/suite/rpl_ndb/t/rpl_row_basic_7ndb.test
      mysql-test/suite/binlog/r/binlog_row_drop_tmp_tbl.result:
        Rename: mysql-test/r/binlog_row_drop_tmp_tbl.result -> mysql-test/suite/binlog/r/binlog_row_drop_tmp_tbl.result
      mysql-test/suite/binlog/r/binlog_row_innodb_stat.result:
        Rename: mysql-test/r/binlog_row_innodb_stat.result -> mysql-test/suite/binlog/r/binlog_row_innodb_stat.result
      mysql-test/suite/binlog/t/binlog_killed.test:
        Rename: mysql-test/t/binlog_killed.test -> mysql-test/suite/binlog/t/binlog_killed.test
      mysql-test/suite/binlog/t/binlog_row_ctype_cp932.test:
        Rename: mysql-test/t/binlog_row_ctype_cp932.test -> mysql-test/suite/binlog/t/binlog_row_ctype_cp932.test
      mysql-test/suite/binlog/t/binlog_row_insert_select.test:
        Rename: mysql-test/t/binlog_row_insert_select.test -> mysql-test/suite/binlog/t/binlog_row_insert_select.test
      mysql-test/suite/ndb/r/ndb_alter_table.result:
        Rename: mysql-test/r/ndb_alter_table.result -> mysql-test/suite/ndb/r/ndb_alter_table.result
      mysql-test/suite/ndb/r/ndb_binlog_multi.result:
        Rename: mysql-test/r/ndb_binlog_multi.result -> mysql-test/suite/ndb/r/ndb_binlog_multi.result
      mysql-test/suite/ndb/r/ndb_cache2.result:
        Rename: mysql-test/r/ndb_cache2.result -> mysql-test/suite/ndb/r/ndb_cache2.result
      mysql-test/suite/ndb/r/ndb_database.result:
        Rename: mysql-test/r/ndb_database.result -> mysql-test/suite/ndb/r/ndb_database.result
      mysql-test/suite/ndb/r/ndb_grant.result:
        Rename: mysql-test/r/ndb_grant.result -> mysql-test/suite/ndb/r/ndb_grant.result
      mysql-test/suite/ndb/r/ndb_restore.result:
        Rename: mysql-test/r/ndb_restore.result -> mysql-test/suite/ndb/r/ndb_restore.result
      mysql-test/suite/ndb/r/ndb_restore_partition.result:
        Rename: mysql-test/r/ndb_restore_partition.result -> mysql-test/suite/ndb/r/ndb_restore_partition.result
      mysql-test/suite/ndb/r/ndbapi.result:
        Rename: mysql-test/r/ndbapi.result -> mysql-test/suite/ndb/r/ndbapi.result
      mysql-test/suite/ndb/t/ndb_autodiscover2-master.opt:
        Rename: mysql-test/t/ndb_autodiscover2-master.opt -> mysql-test/suite/ndb/t/ndb_autodiscover2-master.opt
      mysql-test/suite/ndb/t/ndb_autodiscover2.test:
        Rename: mysql-test/t/ndb_autodiscover2.test -> mysql-test/suite/ndb/t/ndb_autodiscover2.test
      mysql-test/suite/ndb/t/ndb_index.test:
        Rename: mysql-test/t/ndb_index.test -> mysql-test/suite/ndb/t/ndb_index.test
      mysql-test/suite/ndb/t/ndb_lock.test:
        Rename: mysql-test/t/ndb_lock.test -> mysql-test/suite/ndb/t/ndb_lock.test
      mysql-test/suite/ndb/t/ndb_restore_compat.test:
        Rename: mysql-test/t/ndb_restore_compat.test -> mysql-test/suite/ndb/t/ndb_restore_compat.test
      mysql-test/suite/ndb/t/ndb_sp.test:
        Rename: mysql-test/t/ndb_sp.test -> mysql-test/suite/ndb/t/ndb_sp.test
      mysql-test/suite/ndb/t/ndb_subquery.test:
        Rename: mysql-test/t/ndb_subquery.test -> mysql-test/suite/ndb/t/ndb_subquery.test
      mysql-test/suite/ndb/t/ndb_temporary.test:
        Rename: mysql-test/t/ndb_temporary.test -> mysql-test/suite/ndb/t/ndb_temporary.test
      mysql-test/suite/rpl/r/rpl_LD_INFILE.result:
        Rename: mysql-test/r/rpl_LD_INFILE.result -> mysql-test/suite/rpl/r/rpl_LD_INFILE.result
      mysql-test/suite/rpl/r/rpl_auto_increment.result:
        Rename: mysql-test/r/rpl_auto_increment.result -> mysql-test/suite/rpl/r/rpl_auto_increment.result
      mysql-test/suite/rpl/r/rpl_create_database.result:
        Rename: mysql-test/r/rpl_create_database.result -> mysql-test/suite/rpl/r/rpl_create_database.result
      mysql-test/suite/rpl/r/rpl_critical_errors.result.txt:
        Rename: mysql-test/r/rpl_critical_errors.result.txt -> mysql-test/suite/rpl/r/rpl_critical_errors.result.txt
      mysql-test/suite/rpl/r/rpl_empty_master_crash.result:
        Rename: mysql-test/r/rpl_empty_master_crash.result -> mysql-test/suite/rpl/r/rpl_empty_master_crash.result
      mysql-test/suite/rpl/r/rpl_flushlog_loop.result:
        Rename: mysql-test/r/rpl_flushlog_loop.result -> mysql-test/suite/rpl/r/rpl_flushlog_loop.result
      mysql-test/suite/rpl/r/rpl_ignore_table.result:
        Rename: mysql-test/r/rpl_ignore_table.result -> mysql-test/suite/rpl/r/rpl_ignore_table.result
      mysql-test/suite/rpl/r/rpl_load_table_from_master.result:
        Rename: mysql-test/r/rpl_load_table_from_master.result -> mysql-test/suite/rpl/r/rpl_load_table_from_master.result
      mysql-test/suite/rpl/r/rpl_loaddata_simple.result:
        Rename: mysql-test/r/rpl_loaddata_simple.result -> mysql-test/suite/rpl/r/rpl_loaddata_simple.result
      mysql-test/suite/rpl/r/rpl_loaddatalocal.result:
        Rename: mysql-test/r/rpl_loaddatalocal.result -> mysql-test/suite/rpl/r/rpl_loaddatalocal.result
      mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result:
        Rename: mysql-test/r/rpl_rbr_to_sbr.result -> mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result
      mysql-test/suite/rpl/r/rpl_relay_space_myisam.result:
        Rename: mysql-test/r/rpl_relay_space_myisam.result -> mysql-test/suite/rpl/r/rpl_relay_space_myisam.result
      mysql-test/suite/rpl/r/rpl_rotate_logs.result:
        Rename: mysql-test/r/rpl_rotate_logs.result -> mysql-test/suite/rpl/r/rpl_rotate_logs.result
      mysql-test/suite/rpl/r/rpl_row_001.result:
        Rename: mysql-test/r/rpl_row_001.result -> mysql-test/suite/rpl/r/rpl_row_001.result
      mysql-test/suite/rpl/r/rpl_row_basic_11bugs-master.opt:
        Rename: mysql-test/r/rpl_row_basic_11bugs-master.opt -> mysql-test/suite/rpl/r/rpl_row_basic_11bugs-master.opt
      mysql-test/suite/rpl/r/rpl_row_basic_11bugs-slave.opt:
        Rename: mysql-test/r/rpl_row_basic_11bugs-slave.opt -> mysql-test/suite/rpl/r/rpl_row_basic_11bugs-slave.opt
      mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result:
        Rename: mysql-test/r/rpl_row_basic_3innodb.result -> mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result
      mysql-test/suite/rpl/r/rpl_row_delayed_ins.result:
        Rename: mysql-test/r/rpl_row_delayed_ins.result -> mysql-test/suite/rpl/r/rpl_row_delayed_ins.result
      mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result:
        Rename: mysql-test/r/rpl_row_mysqlbinlog.result -> mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result
      mysql-test/suite/rpl/r/rpl_row_mystery22.result:
        Rename: mysql-test/r/rpl_row_mystery22.result -> mysql-test/suite/rpl/r/rpl_row_mystery22.result
      mysql-test/suite/rpl/r/rpl_row_reset_slave.result:
        Rename: mysql-test/r/rpl_row_reset_slave.result -> mysql-test/suite/rpl/r/rpl_row_reset_slave.result
      mysql-test/suite/rpl/r/rpl_row_sp005.result:
        Rename: mysql-test/r/rpl_row_sp005.result -> mysql-test/suite/rpl/r/rpl_row_sp005.result
      mysql-test/suite/rpl/r/rpl_row_tabledefs_7ndb.result:
        Rename: mysql-test/r/rpl_row_tabledefs_7ndb.result -> mysql-test/suite/rpl/r/rpl_row_tabledefs_7ndb.result
      mysql-test/suite/rpl/r/rpl_server_id2.result:
        Rename: mysql-test/r/rpl_server_id2.result -> mysql-test/suite/rpl/r/rpl_server_id2.result
      mysql-test/suite/rpl/r/rpl_sp.result:
        Rename: mysql-test/r/rpl_sp.result -> mysql-test/suite/rpl/r/rpl_sp.result
      mysql-test/suite/rpl/r/rpl_temporary.result:
        Rename: mysql-test/r/rpl_temporary.result -> mysql-test/suite/rpl/r/rpl_temporary.result
      mysql-test/suite/rpl/r/rpl_trunc_temp.result:
        Rename: mysql-test/r/rpl_trunc_temp.result -> mysql-test/suite/rpl/r/rpl_trunc_temp.result
      mysql-test/suite/rpl/r/rpl_truncate_7ndb_2.result:
        Rename: mysql-test/r/rpl_truncate_7ndb_2.result -> mysql-test/suite/rpl/r/rpl_truncate_7ndb_2.result
      mysql-test/suite/rpl/r/rpl_user_variables.result:
        Rename: mysql-test/r/rpl_user_variables.result -> mysql-test/suite/rpl/r/rpl_user_variables.result
      mysql-test/suite/rpl/t/rpl000010-slave.opt:
        Rename: mysql-test/t/rpl000010-slave.opt -> mysql-test/suite/rpl/t/rpl000010-slave.opt
      mysql-test/suite/rpl/t/rpl_alter.test:
        Rename: mysql-test/t/rpl_alter.test -> mysql-test/suite/rpl/t/rpl_alter.test
      mysql-test/suite/rpl/t/rpl_deadlock_innodb.test:
        Rename: mysql-test/t/rpl_deadlock_innodb.test -> mysql-test/suite/rpl/t/rpl_deadlock_innodb.test
      mysql-test/suite/rpl/t/rpl_events.test:
        Rename: mysql-test/t/rpl_events.test -> mysql-test/suite/rpl/t/rpl_events.test
      mysql-test/suite/rpl/t/rpl_ignore_revoke-slave.opt:
        Rename: mysql-test/t/rpl_ignore_revoke-slave.opt -> mysql-test/suite/rpl/t/rpl_ignore_revoke-slave.opt
      mysql-test/suite/rpl/t/rpl_ignore_table-slave.opt:
        Rename: mysql-test/t/rpl_ignore_table-slave.opt -> mysql-test/suite/rpl/t/rpl_ignore_table-slave.opt
      mysql-test/suite/rpl/t/rpl_insert.test:
        Rename: mysql-test/t/rpl_insert.test -> mysql-test/suite/rpl/t/rpl_insert.test
      mysql-test/suite/rpl/t/rpl_insert_id.test:
        Rename: mysql-test/t/rpl_insert_id.test -> mysql-test/suite/rpl/t/rpl_insert_id.test
      mysql-test/suite/rpl/t/rpl_insert_id_pk.test:
        Rename: mysql-test/t/rpl_insert_id_pk.test -> mysql-test/suite/rpl/t/rpl_insert_id_pk.test
      mysql-test/suite/rpl/t/rpl_insert_ignore.test:
        Rename: mysql-test/t/rpl_insert_ignore.test -> mysql-test/suite/rpl/t/rpl_insert_ignore.test
      mysql-test/suite/rpl/t/rpl_loaddata_charset.test:
        Rename: mysql-test/t/rpl_loaddata_charset.test -> mysql-test/suite/rpl/t/rpl_loaddata_charset.test
      mysql-test/suite/rpl/t/rpl_loaddata_simple.test:
        Rename: mysql-test/t/rpl_loaddata_simple.test -> mysql-test/suite/rpl/t/rpl_loaddata_simple.test
      mysql-test/suite/rpl/t/rpl_multi_delete2.test:
        Rename: mysql-test/t/rpl_multi_delete2.test -> mysql-test/suite/rpl/t/rpl_multi_delete2.test
      mysql-test/suite/rpl/t/rpl_multi_engine-slave.opt:
        Rename: mysql-test/t/rpl_multi_engine-slave.opt -> mysql-test/suite/rpl/t/rpl_multi_engine-slave.opt
      mysql-test/suite/rpl/t/rpl_read_only-slave.opt:
        Rename: mysql-test/t/rpl_read_only-slave.opt -> mysql-test/suite/rpl/t/rpl_read_only-slave.opt
      mysql-test/suite/rpl/t/rpl_relayrotate-slave.opt:
        Rename: mysql-test/t/rpl_relayrotate-slave.opt -> mysql-test/suite/rpl/t/rpl_relayrotate-slave.opt
      mysql-test/suite/rpl/t/rpl_replicate_do.test:
        Rename: mysql-test/t/rpl_replicate_do.test -> mysql-test/suite/rpl/t/rpl_replicate_do.test
      mysql-test/suite/rpl/t/rpl_replicate_ignore_db-slave.opt:
        Rename: mysql-test/t/rpl_replicate_ignore_db-slave.opt -> mysql-test/suite/rpl/t/rpl_replicate_ignore_db-slave.opt
      mysql-test/suite/rpl/t/rpl_row_001.test:
        Rename: mysql-test/t/rpl_row_001.test -> mysql-test/suite/rpl/t/rpl_row_001.test
      mysql-test/suite/rpl/t/rpl_row_basic_2myisam.test:
        Rename: mysql-test/t/rpl_row_basic_2myisam.test -> mysql-test/suite/rpl/t/rpl_row_basic_2myisam.test
      mysql-test/suite/rpl/t/rpl_row_basic_3innodb-slave.opt:
        Rename: mysql-test/t/rpl_row_basic_3innodb-slave.opt -> mysql-test/suite/rpl/t/rpl_row_basic_3innodb-slave.opt
      mysql-test/suite/rpl/t/rpl_row_basic_8partition.test:
        Rename: mysql-test/t/rpl_row_basic_8partition.test -> mysql-test/suite/rpl/t/rpl_row_basic_8partition.test
      mysql-test/suite/rpl/t/rpl_row_charset.test:
        Rename: mysql-test/t/rpl_row_charset.test -> mysql-test/suite/rpl/t/rpl_row_charset.test
      mysql-test/suite/rpl/t/rpl_row_drop.test:
        Rename: mysql-test/t/rpl_row_drop.test -> mysql-test/suite/rpl/t/rpl_row_drop.test
      mysql-test/suite/rpl/t/rpl_row_trig004.test:
        Rename: mysql-test/t/rpl_row_trig004.test -> mysql-test/suite/rpl/t/rpl_row_trig004.test
      mysql-test/suite/rpl/t/rpl_row_view01.test:
        Rename: mysql-test/t/rpl_row_view01.test -> mysql-test/suite/rpl/t/rpl_row_view01.test
      mysql-test/suite/rpl/t/rpl_sp_effects-master.opt:
        Rename: mysql-test/t/rpl_sp_effects-master.opt -> mysql-test/suite/rpl/t/rpl_sp_effects-master.opt
      mysql-test/suite/rpl/t/rpl_stm_charset.test:
        Rename: mysql-test/t/rpl_stm_charset.test -> mysql-test/suite/rpl/t/rpl_stm_charset.test
      mysql-test/suite/rpl/t/rpl_stm_log-slave.opt:
        Rename: mysql-test/t/rpl_stm_log-slave.opt -> mysql-test/suite/rpl/t/rpl_stm_log-slave.opt
      mysql-test/suite/rpl/t/rpl_truncate_7ndb_2-master.opt:
        Rename: mysql-test/t/rpl_truncate_7ndb_2-master.opt -> mysql-test/suite/rpl/t/rpl_truncate_7ndb_2-master.opt
      mysql-test/suite/rpl/t/rpl_variables-master.opt:
        Rename: mysql-test/t/rpl_variables-master.opt -> mysql-test/suite/rpl/t/rpl_variables-master.opt
      mysql-test/suite/rpl/t/rpl_view-slave.opt:
        Rename: mysql-test/t/rpl_view-slave.opt -> mysql-test/suite/rpl/t/rpl_view-slave.opt
      mysql-test/suite/rpl/t/rpl_view.test:
        Rename: mysql-test/t/rpl_view.test -> mysql-test/suite/rpl/t/rpl_view.test
      mysql-test/suite/rpl_ndb/r/rpl_ndb_charset.result:
        Rename: mysql-test/r/rpl_ndb_charset.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_charset.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result:
        Rename: mysql-test/r/rpl_ndb_circular_simplex.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_advance.result:
        Rename: mysql-test/r/rpl_ndb_dd_advance.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_advance.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_trig004.result:
        Rename: mysql-test/r/rpl_ndb_trig004.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_trig004.result
      mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb-master.opt:
        Rename: mysql-test/t/rpl_ndb_2innodb-master.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb-master.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_UUID.test:
        Rename: mysql-test/t/rpl_ndb_UUID.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_UUID.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test:
        Rename: mysql-test/t/rpl_ndb_circular_simplex.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_extraCol.test:
        Rename: mysql-test/t/rpl_ndb_extraCol.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_extraCol.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb-master.opt:
        Rename: mysql-test/t/rpl_ndb_stm_innodb-master.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb-master.opt
      mysql-test/suite/binlog/t/binlog_row_binlog.test:
        Rename: mysql-test/t/binlog_row_binlog.test -> mysql-test/suite/binlog/t/binlog_row_binlog.test
      mysql-test/suite/ndb/r/ndb_autodiscover.result:
        Rename: mysql-test/r/ndb_autodiscover.result -> mysql-test/suite/ndb/r/ndb_autodiscover.result
      mysql-test/suite/ndb/r/ndb_binlog_ignore_db.result:
        Rename: mysql-test/r/ndb_binlog_ignore_db.result -> mysql-test/suite/ndb/r/ndb_binlog_ignore_db.result
      mysql-test/suite/ndb/r/ndb_cache_multi.result:
        Rename: mysql-test/r/ndb_cache_multi.result -> mysql-test/suite/ndb/r/ndb_cache_multi.result
      mysql-test/suite/ndb/r/ndb_partition_error.result:
        Rename: mysql-test/r/ndb_partition_error.result -> mysql-test/suite/ndb/r/ndb_partition_error.result
      mysql-test/suite/ndb/r/ndb_read_multi_range.result:
        Rename: mysql-test/r/ndb_read_multi_range.result -> mysql-test/suite/ndb/r/ndb_read_multi_range.result
      mysql-test/suite/ndb/r/ndb_truncate.result:
        Rename: mysql-test/r/ndb_truncate.result -> mysql-test/suite/ndb/r/ndb_truncate.result
      mysql-test/suite/ndb/t/ndb_gis.test:
        Rename: mysql-test/t/ndb_gis.test -> mysql-test/suite/ndb/t/ndb_gis.test
      mysql-test/suite/ndb/t/ndb_grant.later:
        Rename: mysql-test/t/ndb_grant.later -> mysql-test/suite/ndb/t/ndb_grant.later
      mysql-test/suite/rpl/r/rpl_err_ignoredtable.result:
        Rename: mysql-test/r/rpl_err_ignoredtable.result -> mysql-test/suite/rpl/r/rpl_err_ignoredtable.result
      mysql-test/suite/rpl/r/rpl_ignore_grant.result:
        Rename: mysql-test/r/rpl_ignore_grant.result -> mysql-test/suite/rpl/r/rpl_ignore_grant.result
      mysql-test/suite/rpl/r/rpl_load_from_master.result:
        Rename: mysql-test/r/rpl_load_from_master.result -> mysql-test/suite/rpl/r/rpl_load_from_master.result
      mysql-test/suite/rpl/r/rpl_master_pos_wait.result:
        Rename: mysql-test/r/rpl_master_pos_wait.result -> mysql-test/suite/rpl/r/rpl_master_pos_wait.result
      mysql-test/suite/rpl/r/rpl_misc_functions.result:
        Rename: mysql-test/r/rpl_misc_functions.result -> mysql-test/suite/rpl/r/rpl_misc_functions.result
      mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result:
        Rename: mysql-test/r/rpl_row_basic_11bugs.result -> mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result
      mysql-test/suite/rpl/r/rpl_row_max_relay_size.result:
        Rename: mysql-test/r/rpl_row_max_relay_size.result -> mysql-test/suite/rpl/r/rpl_row_max_relay_size.result
      mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
        Rename: mysql-test/r/rpl_row_tabledefs_2myisam.result -> mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result
      mysql-test/suite/rpl/r/rpl_server_id1.result:
        Rename: mysql-test/r/rpl_server_id1.result -> mysql-test/suite/rpl/r/rpl_server_id1.result
      mysql-test/suite/rpl/r/rpl_sf.result:
        Rename: mysql-test/r/rpl_sf.result -> mysql-test/suite/rpl/r/rpl_sf.result
      mysql-test/suite/rpl/r/rpl_start_stop_slave.result:
        Rename: mysql-test/r/rpl_start_stop_slave.result -> mysql-test/suite/rpl/r/rpl_start_stop_slave.result
      mysql-test/suite/rpl/r/rpl_stm_reset_slave.result:
        Rename: mysql-test/r/rpl_stm_reset_slave.result -> mysql-test/suite/rpl/r/rpl_stm_reset_slave.result
      mysql-test/suite/rpl/r/rpl_stm_until.result:
        Rename: mysql-test/r/rpl_stm_until.result -> mysql-test/suite/rpl/r/rpl_stm_until.result
      mysql-test/suite/rpl/t/rpl_000015-slave.sh:
        Rename: mysql-test/t/rpl_000015-slave.sh -> mysql-test/suite/rpl/t/rpl_000015-slave.sh
      mysql-test/suite/rpl/t/rpl_change_master.test:
        Rename: mysql-test/t/rpl_change_master.test -> mysql-test/suite/rpl/t/rpl_change_master.test
      mysql-test/suite/rpl/t/rpl_drop_temp-slave.opt:
        Rename: mysql-test/t/rpl_drop_temp-slave.opt -> mysql-test/suite/rpl/t/rpl_drop_temp-slave.opt
      mysql-test/suite/rpl/t/rpl_multi_engine.test:
        Rename: mysql-test/t/rpl_multi_engine.test -> mysql-test/suite/rpl/t/rpl_multi_engine.test
      mysql-test/suite/rpl/t/rpl_relayspace-slave.opt:
        Rename: mysql-test/t/rpl_relayspace-slave.opt -> mysql-test/suite/rpl/t/rpl_relayspace-slave.opt
      mysql-test/suite/rpl/t/rpl_row_blob_myisam.test:
        Rename: mysql-test/t/rpl_row_blob_myisam.test -> mysql-test/suite/rpl/t/rpl_row_blob_myisam.test
      mysql-test/suite/rpl/t/rpl_row_sp009.test:
        Rename: mysql-test/t/rpl_row_sp009.test -> mysql-test/suite/rpl/t/rpl_row_sp009.test
      mysql-test/suite/rpl/t/rpl_row_sp010.test:
        Rename: mysql-test/t/rpl_row_sp010.test -> mysql-test/suite/rpl/t/rpl_row_sp010.test
      mysql-test/suite/rpl/t/rpl_stm_insert_delayed.test:
        Rename: mysql-test/t/rpl_stm_insert_delayed.test -> mysql-test/suite/rpl/t/rpl_stm_insert_delayed.test
      mysql-test/suite/rpl/t/rpl_stm_until.test:
        Rename: mysql-test/t/rpl_stm_until.test -> mysql-test/suite/rpl/t/rpl_stm_until.test
      mysql-test/suite/rpl/t/rpl_truncate_3innodb.test:
        Rename: mysql-test/t/rpl_truncate_3innodb.test -> mysql-test/suite/rpl/t/rpl_truncate_3innodb.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_bank.test:
        Rename: mysql-test/t/rpl_ndb_bank.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_bank.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_row_001.test:
        Rename: mysql-test/t/rpl_ndb_row_001.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_row_001.test
      mysql-test/lib/mtr_cases.pl:
        Reorganize collect function to collect from more than one suite
        Add new function collect_one_suite
        Set name of test to <suite>.<testname>
      mysql-test/lib/mtr_report.pl:
        Determine name of files from "result_file" name
      mysql-test/mysql-test-run.pl:
        Collect tests from suites main, binlog, rpl, rpl_ndb and ndb as default.
        Add --suites as a synonym of --suite and allow a semicolon separated
        list of suite names to be passed to it.
        Determine name of files to cleanup from "result_file" name
        Update usage
        Add possibility to add a suite.opt file
      mysql-test/t/disabled.def:
        Move disabled testcases to their respective suite
      mysql-test/suite/funcs_1/t/suite.opt:
        New BitKeeper file ``mysql-test/suite/funcs_1/t/suite.opt''
      mysql-test/suite/funcs_2/t/suite.opt:
        New BitKeeper file ``mysql-test/suite/funcs_2/t/suite.opt''
      mysql-test/suite/ndb/t/disabled.def:
        New BitKeeper file ``mysql-test/suite/ndb/t/disabled.def''
      mysql-test/suite/rpl/t/disabled.def:
        New BitKeeper file ``mysql-test/suite/rpl/t/disabled.def''
      mysql-test/suite/rpl_ndb/t/disabled.def:
        New BitKeeper file ``mysql-test/suite/rpl_ndb/t/disabled.def''
      a40e44ef
    • msvensson@pilot.(none)'s avatar
      WL#3933 Split main test suite to rpl, rpl_ndb and ndb · 8661497e
      msvensson@pilot.(none) authored
       - Update mysql-test-run.pl to collect tests from several suites
       - Group test into suites
       - Add suite.opt file
      8661497e
  5. 08 Feb, 2006 2 commits
    • unknown's avatar
      More updates for using NDB as default and some bug fixes along the way · 68b51ff0
      unknown authored
      mysql-test/extra/rpl_tests/rpl_insert_id.test:
        Updated wiht 1022 error, order by and PK for use with NDB engine
      mysql-test/r/rpl_insert_id.result:
        Updated wiht 1022 error, order by and PK for use with NDB engine
      mysql-test/t/rpl_skip_error.test:
        updated to wrk with ndb
      mysql-test/r/rpl_skip_error.result:
        updated to wrk with ndb
      mysql-test/t/rpl_sporadic_master.test:
        updated to wrk with ndb
      mysql-test/r/rpl_sporadic_master.result:
        updated to wrk with ndb
      mysql-test/t/rpl_row_trig002.test:
        updated to work with NDB engine
      mysql-test/r/rpl_row_trig002.result:
        updated to work with NDB engine
      mysql-test/t/rpl_temporary.test:
        updated to work with NDB engine
      mysql-test/r/rpl_temporary.result:
        updated to work with NDB engine
      mysql-test/extra/rpl_tests/rpl_row_001.test:
        updated to work with NDB as default engine
      mysql-test/r/rpl_row_001.result:
        updated to work with NDB as default engine
      mysql-test/t/rpl_row_blob_innodb.test:
        Fixed bug in test case
      mysql-test/t/rpl_row_blob_innodb-slave.opt:
        Added slave option file to ensure correct engine type on slave
      mysql-test/r/rpl_row_blob_innodb.result:
        Updated results
      mysql-test/r/rpl_row_blob_myisam.result:
        Updated results
      mysql-test/r/rpl_ndb_log.result:
        update results file
      68b51ff0
    • jmiller@mysql.com's avatar
  6. 28 Jul, 2005 2 commits
    • unknown's avatar
      Added end marker for tests to make future merges easier · 167fb5f1
      unknown authored
      mysql-test/t/alias.test:
        Added end marker for test to make future merges easier
      mysql-test/t/alter_table.test:
        Added end marker for test to make future merges easier
      mysql-test/t/analyse.test:
        Added end marker for test to make future merges easier
      mysql-test/t/analyze.test:
        Added end marker for test to make future merges easier
        Fixed length of comment lines
      mysql-test/t/ansi.test:
        Added end marker for test to make future merges easier
      mysql-test/t/archive.test:
        Added end marker for test to make future merges easier
      mysql-test/t/auto_increment.test:
        Added end marker for test to make future merges easier
      mysql-test/t/backup.test:
        Added end marker for test to make future merges easier
      mysql-test/t/bdb-alter-table-1.test:
        Added end marker for test to make future merges easier
      mysql-test/t/bdb-alter-table-2.test:
        Added end marker for test to make future merges easier
      mysql-test/t/bdb-crash.test:
        Added end marker for test to make future merges easier
      mysql-test/t/bdb-deadlock.test:
        Added end marker for test to make future merges easier
      mysql-test/t/bdb-deadlock.tminus:
        Added end marker for test to make future merges easier
      mysql-test/t/bdb.test:
        Added end marker for test to make future merges easier
      mysql-test/t/bdb_cache.test:
        Added end marker for test to make future merges easier
      mysql-test/t/bench_count_distinct.test:
        Added end marker for test to make future merges easier
      mysql-test/t/bigint.test:
        Added end marker for test to make future merges easier
      mysql-test/t/binary.test:
        Added end marker for test to make future merges easier
      mysql-test/t/blackhole.test:
        Added end marker for test to make future merges easier
      mysql-test/t/bool.test:
        Added end marker for test to make future merges easier
      mysql-test/t/bulk_replace.test:
        Added end marker for test to make future merges easier
      mysql-test/t/case.test:
        Added end marker for test to make future merges easier
      mysql-test/t/cast.test:
        Added end marker for test to make future merges easier
      mysql-test/t/check.test:
        Added end marker for test to make future merges easier
      mysql-test/t/comments.test:
        Added end marker for test to make future merges easier
      mysql-test/t/compare.test:
        Added end marker for test to make future merges easier
      mysql-test/t/connect.test:
        Added end marker for test to make future merges easier
      mysql-test/t/consistent_snapshot.test:
        Added end marker for test to make future merges easier
      mysql-test/t/constraints.test:
        Added end marker for test to make future merges easier
      mysql-test/t/count_distinct.test:
        Added end marker for test to make future merges easier
      mysql-test/t/count_distinct2.test:
        Added end marker for test to make future merges easier
      mysql-test/t/count_distinct3.test:
        Added end marker for test to make future merges easier
      mysql-test/t/create.test:
        Added end marker for test to make future merges easier
      mysql-test/t/create_select_tmp.test:
        Added end marker for test to make future merges easier
      mysql-test/t/csv.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_big5.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_collate.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_cp1250_ch.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_cp1251.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_cp932.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_create.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_gbk.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_latin1.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_latin1_de.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_latin2.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_many.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_mb.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_recoding.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_sjis.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_tis620.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_uca.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_ucs.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_ucs_binlog.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_ujis.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_utf8.test:
        Added end marker for test to make future merges easier
      mysql-test/t/date_formats.test:
        Added end marker for test to make future merges easier
      mysql-test/t/delayed.test:
        Added end marker for test to make future merges easier
      mysql-test/t/delete.test:
        Added end marker for test to make future merges easier
      mysql-test/t/derived.test:
        Added end marker for test to make future merges easier
      mysql-test/t/dirty_close.test:
        Added end marker for test to make future merges easier
      mysql-test/t/distinct.test:
        Added end marker for test to make future merges easier
      mysql-test/t/drop.test:
        Added end marker for test to make future merges easier
      mysql-test/t/drop_temp_table.test:
        Added end marker for test to make future merges easier
      mysql-test/t/empty_table.test:
        Added end marker for test to make future merges easier
      mysql-test/t/endspace.test:
        Added end marker for test to make future merges easier
      mysql-test/t/errors.test:
        Added end marker for test to make future merges easier
      mysql-test/t/exampledb.test:
        Added end marker for test to make future merges easier
      mysql-test/t/explain.test:
        Added end marker for test to make future merges easier
      mysql-test/t/flush.test:
        Added end marker for test to make future merges easier
      mysql-test/t/flush_block_commit.test:
        Added end marker for test to make future merges easier
      mysql-test/t/flush_table.test:
        Added end marker for test to make future merges easier
      mysql-test/t/foreign_key.test:
        Added end marker for test to make future merges easier
      mysql-test/t/fulltext.test:
        Added end marker for test to make future merges easier
      mysql-test/t/fulltext2.test:
        Added end marker for test to make future merges easier
      mysql-test/t/fulltext_cache.test:
        Added end marker for test to make future merges easier
      mysql-test/t/fulltext_distinct.test:
        Added end marker for test to make future merges easier
      mysql-test/t/fulltext_left_join.test:
        Added end marker for test to make future merges easier
      mysql-test/t/fulltext_multi.test:
        Added end marker for test to make future merges easier
      mysql-test/t/fulltext_order_by.test:
        Added end marker for test to make future merges easier
      mysql-test/t/fulltext_update.test:
        Added end marker for test to make future merges easier
      mysql-test/t/fulltext_var.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_compress.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_concat.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_crypt.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_date_add.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_default.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_des_encrypt.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_encrypt.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_encrypt_nossl.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_equal.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_gconcat.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_group.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_if.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_in.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_isnull.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_like.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_math.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_misc.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_op.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_regexp.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_sapdb.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_set.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_str.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_system.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_test.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_time.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_timestamp.test:
        Added end marker for test to make future merges easier
      mysql-test/t/gcc296.test:
        Added end marker for test to make future merges easier
      mysql-test/t/gis-rtree.test:
        Added end marker for test to make future merges easier
      mysql-test/t/gis.test:
        Added end marker for test to make future merges easier
      mysql-test/t/grant.test:
        Added end marker for test to make future merges easier
      mysql-test/t/grant2.test:
        Added end marker for test to make future merges easier
      mysql-test/t/grant_cache.test:
        Added end marker for test to make future merges easier
      mysql-test/t/group_by.test:
        Added end marker for test to make future merges easier
      mysql-test/t/handler.test:
        Added end marker for test to make future merges easier
      mysql-test/t/having.test:
        Added end marker for test to make future merges easier
      mysql-test/t/heap.test:
        Added end marker for test to make future merges easier
      mysql-test/t/heap_auto_increment.test:
        Added end marker for test to make future merges easier
      mysql-test/t/heap_btree.test:
        Added end marker for test to make future merges easier
      mysql-test/t/heap_hash.test:
        Added end marker for test to make future merges easier
      mysql-test/t/help.test:
        Added end marker for test to make future merges easier
      mysql-test/t/init_connect.test:
        Added end marker for test to make future merges easier
      mysql-test/t/init_file.test:
        Added end marker for test to make future merges easier
      mysql-test/t/innodb-deadlock.test:
        Added end marker for test to make future merges easier
      mysql-test/t/innodb-lock.test:
        Added end marker for test to make future merges easier
      mysql-test/t/innodb-replace.test:
        Added end marker for test to make future merges easier
      mysql-test/t/innodb.test:
        Added end marker for test to make future merges easier
      mysql-test/t/innodb_cache.test:
        Added end marker for test to make future merges easier
      mysql-test/t/innodb_handler.test:
        Added end marker for test to make future merges easier
      mysql-test/t/insert.test:
        Added end marker for test to make future merges easier
      mysql-test/t/insert_select-binlog.test:
        Added end marker for test to make future merges easier
      mysql-test/t/insert_select.test:
        Added end marker for test to make future merges easier
      mysql-test/t/insert_update.test:
        Added end marker for test to make future merges easier
      mysql-test/t/isam.test:
        Added end marker for test to make future merges easier
      mysql-test/t/join.test:
        Added end marker for test to make future merges easier
      mysql-test/t/join_crash.test:
        Added end marker for test to make future merges easier
      mysql-test/t/join_outer.test:
        Added end marker for test to make future merges easier
      mysql-test/t/key.test:
        Added end marker for test to make future merges easier
      mysql-test/t/key_cache.test:
        Added end marker for test to make future merges easier
      mysql-test/t/key_diff.test:
        Added end marker for test to make future merges easier
      mysql-test/t/key_primary.test:
        Added end marker for test to make future merges easier
      mysql-test/t/keywords.test:
        Added end marker for test to make future merges easier
      mysql-test/t/kill.test:
        Added end marker for test to make future merges easier
      mysql-test/t/limit.test:
        Added end marker for test to make future merges easier
      mysql-test/t/loaddata.test:
        Added end marker for test to make future merges easier
      mysql-test/t/lock.test:
        Added end marker for test to make future merges easier
      mysql-test/t/lock_multi.test:
        Added end marker for test to make future merges easier
      mysql-test/t/lock_tables_lost_commit.test:
        Added end marker for test to make future merges easier
      mysql-test/t/lowercase_table.test:
        Added end marker for test to make future merges easier
      mysql-test/t/lowercase_table2.test:
        Added end marker for test to make future merges easier
      mysql-test/t/lowercase_table3.test:
        Added end marker for test to make future merges easier
      mysql-test/t/lowercase_table_grant.test:
        Added end marker for test to make future merges easier
      mysql-test/t/lowercase_table_qcache.test:
        Added end marker for test to make future merges easier
      mysql-test/t/merge.test:
        Added end marker for test to make future merges easier
      mysql-test/t/metadata.test:
        Added end marker for test to make future merges easier
      mysql-test/t/mix_innodb_myisam_binlog.test:
        Added end marker for test to make future merges easier
      mysql-test/t/multi_statement.test:
        Added end marker for test to make future merges easier
      mysql-test/t/multi_update.test:
        Added end marker for test to make future merges easier
      mysql-test/t/myisam-blob.test:
        Added end marker for test to make future merges easier
      mysql-test/t/myisam.test:
        Added end marker for test to make future merges easier
      mysql-test/t/mysql_client_test.test:
        Added end marker for test to make future merges easier
      mysql-test/t/mysql_protocols.test:
        Added end marker for test to make future merges easier
      mysql-test/t/mysqlbinlog.test:
        Added end marker for test to make future merges easier
      mysql-test/t/mysqlbinlog2.test:
        Added end marker for test to make future merges easier
      mysql-test/t/mysqldump.test:
        Added end marker for test to make future merges easier
      mysql-test/t/mysqltest.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_alter_table.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_autodiscover.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_autodiscover2.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_basic.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_blob.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_cache.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_charset.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_config.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_database.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_grant.later:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_index.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_index_ordered.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_index_unique.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_insert.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_limit.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_lock.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_minmax.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_multi.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_replace.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_restore.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_subquery.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_transaction.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_truncate.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_types.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_update.test:
        Added end marker for test to make future merges easier
      mysql-test/t/negation_elimination.test:
        Added end marker for test to make future merges easier
      mysql-test/t/not_embedded_server.test:
        Added end marker for test to make future merges easier
      mysql-test/t/null.test:
        Added end marker for test to make future merges easier
      mysql-test/t/null_key.test:
        Added end marker for test to make future merges easier
      mysql-test/t/odbc.test:
        Added end marker for test to make future merges easier
      mysql-test/t/olap.test:
        Added end marker for test to make future merges easier
      mysql-test/t/openssl_1.test:
        Added end marker for test to make future merges easier
      mysql-test/t/order_by.test:
        Added end marker for test to make future merges easier
      mysql-test/t/order_fill_sortbuf.test:
        Added end marker for test to make future merges easier
      mysql-test/t/outfile.test:
        Added end marker for test to make future merges easier
      mysql-test/t/overflow.test:
        Added end marker for test to make future merges easier
      mysql-test/t/packet.test:
        Added end marker for test to make future merges easier
      mysql-test/t/preload.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ps.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ps_10nestset.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ps_11bugs.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ps_1general.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ps_2myisam.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ps_3innodb.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ps_4heap.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ps_5merge.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ps_6bdb.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ps_7ndb.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ps_grant.test:
        Added end marker for test to make future merges easier
      mysql-test/t/query_cache.test:
        Added end marker for test to make future merges easier
      mysql-test/t/query_cache_merge.test:
        Added end marker for test to make future merges easier
      mysql-test/t/raid.test:
        Added end marker for test to make future merges easier
      mysql-test/t/range.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rename.test:
        Added end marker for test to make future merges easier
      mysql-test/t/repair.test:
        Added end marker for test to make future merges easier
      mysql-test/t/replace.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rollback.test:
        Added end marker for test to make future merges easier
      mysql-test/t/row.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl000001.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl000002.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl000004.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl000005.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl000006.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl000008.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl000009.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl000010.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl000011.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl000012.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl000013.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl000015.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl000017.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl000018.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_EE_error.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_alter.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_chain_temp_table.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_change_master.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_charset.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_commit_after_flush.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_create_database.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_ddl.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_deadlock.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_delete_all.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_do_grant.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_drop.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_drop_temp.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_empty_master_crash.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_error_ignored_table.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_failed_optimize.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_failsafe.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_flush_log_loop.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_flush_tables.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_free_items.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_get_lock.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_heap.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_ignore_grant.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_init_slave.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_innodb.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_insert_id.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_insert_ignore.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_loaddata.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_loaddata_rule_m.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_loaddata_rule_s.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_loaddatalocal.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_log.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_log_pos.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_many_optimize.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_master_pos_wait.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_max_relay_size.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_misc_functions.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_multi_delete.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_multi_delete2.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_multi_query.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_multi_update.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_multi_update2.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_multi_update3.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_mystery22.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_openssl.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_optimize.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_ps.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_redirect.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_relayrotate.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_relayspace.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_replicate_do.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_reset_slave.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_rewrite_db.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_rotate_logs.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_server_id1.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_server_id2.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_set_charset.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_skip_error.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_sporadic_master.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_start_stop_slave.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_temporary.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_timezone.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_trunc_binlog.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_until.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_user_variables.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_variables.test:
        Added end marker for test to make future merges easier
      mysql-test/t/select.test:
        Added end marker for test to make future merges easier
      mysql-test/t/select_found.test:
        Added end marker for test to make future merges easier
      mysql-test/t/select_safe.test:
        Added end marker for test to make future merges easier
      mysql-test/t/show_check.test:
        Added end marker for test to make future merges easier
      mysql-test/t/skip_name_resolve.test:
        Added end marker for test to make future merges easier
      mysql-test/t/sql_mode.test:
        Added end marker for test to make future merges easier
      mysql-test/t/status.test:
        Added end marker for test to make future merges easier
      mysql-test/t/subselect.test:
        Added end marker for test to make future merges easier
      mysql-test/t/subselect2.test:
        Added end marker for test to make future merges easier
      mysql-test/t/subselect_gis.test:
        Added end marker for test to make future merges easier
      mysql-test/t/subselect_innodb.test:
        Added end marker for test to make future merges easier
      mysql-test/t/symlink.test:
        Added end marker for test to make future merges easier
      mysql-test/t/synchronization.test:
        Added end marker for test to make future merges easier
      mysql-test/t/system_mysql_db.test:
        Added end marker for test to make future merges easier
      mysql-test/t/system_mysql_db_fix.test:
        Added end marker for test to make future merges easier
      mysql-test/t/system_mysql_db_refs.test:
        Added end marker for test to make future merges easier
      mysql-test/t/tablelock.test:
        Added end marker for test to make future merges easier
      mysql-test/t/temp_table.test:
        Added end marker for test to make future merges easier
      mysql-test/t/timezone.test:
        Added end marker for test to make future merges easier
      mysql-test/t/timezone2.test:
        Added end marker for test to make future merges easier
      mysql-test/t/timezone3.test:
        Added end marker for test to make future merges easier
      mysql-test/t/timezone_grant.test:
        Added end marker for test to make future merges easier
      mysql-test/t/truncate.test:
        Added end marker for test to make future merges easier
      mysql-test/t/type_blob.test:
        Added end marker for test to make future merges easier
      mysql-test/t/type_date.test:
        Added end marker for test to make future merges easier
      mysql-test/t/type_datetime.test:
        Added end marker for test to make future merges easier
      mysql-test/t/type_decimal.test:
        Added end marker for test to make future merges easier
      mysql-test/t/type_enum.test:
        Added end marker for test to make future merges easier
      mysql-test/t/type_float.test:
        Added end marker for test to make future merges easier
      mysql-test/t/type_nchar.test:
        Added end marker for test to make future merges easier
      mysql-test/t/type_ranges.test:
        Added end marker for test to make future merges easier
      mysql-test/t/type_set.test:
        Added end marker for test to make future merges easier
      mysql-test/t/type_time.test:
        Added end marker for test to make future merges easier
      mysql-test/t/type_timestamp.test:
        Added end marker for test to make future merges easier
      mysql-test/t/type_uint.test:
        Added end marker for test to make future merges easier
      mysql-test/t/type_year.test:
        Added end marker for test to make future merges easier
      mysql-test/t/union.test:
        Added end marker for test to make future merges easier
      mysql-test/t/update.test:
        Added end marker for test to make future merges easier
      mysql-test/t/user_var-binlog.test:
        Added end marker for test to make future merges easier
      mysql-test/t/user_var.test:
        Added end marker for test to make future merges easier
      mysql-test/t/varbinary.test:
        Added end marker for test to make future merges easier
      mysql-test/t/variables.test:
        Added end marker for test to make future merges easier
      mysql-test/t/warnings.test:
        Added end marker for test to make future merges easier
      167fb5f1
    • monty@mysql.com's avatar
  7. 24 Oct, 2002 2 commits
  8. 22 Aug, 2002 2 commits
    • unknown's avatar
      Fixed bug in wait_for_update() that I had introduced. · e4d5597d
      unknown authored
      Changed option variables to my_bool (to avoid bugs in my_getopt())
      Added new thread specific mutex LOCK_delete to be able to free LOCK_thread_count early.
      Changed usage of LOCK_thread_count -> LOCK_status for statistics variables
      
      
      libmysqld/lib_sql.cc:
        Removed not needed LOCK
      mysql-test/mysql-test-run.sh:
        Log name of running test
      mysql-test/r/rpl_sporadic_master.result:
        Cleaned up test
      mysql-test/t/rpl_sporadic_master.test:
        cleaned up test
      sql/log.cc:
        Cleanup.
        Fixed bug in wait_for_update() that I had introduced.
      sql/mini_client.cc:
        Indentation changes.
      sql/mysql_priv.h:
        Changed option variables to my_bool.
      sql/mysqld.cc:
        Changed option variables to my_bool.
        Removed not used LOCK_server_id
        Minor code cleanups.
      sql/repl_failsafe.cc:
        Minor code cleanups
      sql/slave.cc:
        Minor code cleanups.
        Fixed usage of wait_for_update().
      sql/slave.h:
        Changed option variables to my_bool.
      sql/sql_class.cc:
        Added new thread specific mutex LOCK_delete to be able to free LOCK_thread_count early
      sql/sql_class.h:
        Added new thread specific mutex LOCK_delete to be able to free LOCK_thread_count early
      sql/sql_insert.cc:
        Do broadcast after unlock()
      sql/sql_parse.cc:
        Removed not needed LOCK
        Changed usage of LOCK_thread_count -> LOCK_status for statistics variables
        Changed killing of threads to not lock LOCK_thread_count for long.
      sql/sql_repl.cc:
        Changed options variables to my_bool
        Fixed usage of wait_for_update()
        Fixed loop to kill slaves to not lock LOCK_thread_count for long.
        Code optimization.
      sql/sql_repl.h:
        bool -> my_bool
        Fixed KICK_SLAVE to use LOCK_delete
      e4d5597d
    • monty@hundin.mysql.fi's avatar
      Fixed bug in wait_for_update() that I had introduced. · f36f9d00
      monty@hundin.mysql.fi authored
      Changed option variables to my_bool (to avoid bugs in my_getopt())
      Added new thread specific mutex LOCK_delete to be able to free LOCK_thread_count early.
      Changed usage of LOCK_thread_count -> LOCK_status for statistics variables
      f36f9d00
  9. 08 Aug, 2002 2 commits
    • unknown's avatar
      Lots of code fixes to the replication code (especially the binary logging and... · f01f4991
      unknown authored
      Lots of code fixes to the replication code (especially the binary logging and index log file handling)
      Fixed bugs in my last changeset that made MySQL hard to compile.
      Added mutex around some data that could cause table cache corruptions when using OPTIMIZE TABLE / REPAIR TABLE or automatic repair of MyISAM tables.
      Added mutex around some data in the slave start/stop code that could cause THD linked list corruptions
      Extended my_chsize() to allow one to specify a filler character.
      Extend vio_blocking to return the old state (This made some usage of this function much simpler)
      Added testing for some functions that they caller have got the required mutexes before calling the function.
      Use setrlimit() to ensure that we can write core file if one specifies --core-file.
      Added --slave-compressed-protocol
      Made 2 the minimum length for ft_min_word_len
      Added variables foreign_key_checks & unique_checks.
      Less logging from replication code (if not started with --log-warnings)
      Changed that SHOW INNODB STATUS requre the SUPER privilege
      More DBUG statements and a lot of new code comments
      
      
      BitKeeper/deleted/.del-rpl_compat.result~c950bc346b12c61a:
        Delete: mysql-test/r/rpl_compat.result
      BitKeeper/deleted/.del-rpl_compat.test~5f6ba955e02aa95f:
        Delete: mysql-test/t/rpl_compat.test
      Docs/manual.texi:
        Updated manual with fixes in this changeset
      client/mysqltest.c:
        Indentation cleanup
        Better error messages for some error conditions.
      include/my_pthread.h:
        Added 'safe_mutex_assert_owner()' to check that the thread really owns the mutex.
      include/my_sys.h:
        Extended my_chsize() to allow one to specify a filler character.
        (For MySQL index logs)
      include/raid.h:
        New my_chsize()
      include/violite.h:
        Extend vio_blocking to return the old state
      innobase/include/dyn0dyn.h:
        Merge with 3.23 (AIX DYN_ARRAY_DATA_SIZE)
      innobase/include/dyn0dyn.ic:
        Merge with 3.23
      isam/create.c:
        Fix for new my_chsize()
      isam/isamchk.c:
        Fix for new my_chsize()
      isam/pack_isam.c:
        Fix for new my_chsize()
      libmysql/manager.c:
        Fix for new vio_blocking()
      libmysqld/lib_sql.cc:
        Fix for new open_log()
      myisam/mi_cache.c:
        Fix typo from previous checking
      myisam/mi_check.c:
        Fix for new my_chsize()
      myisam/mi_create.c:
        Fix for new my_chsize()
      myisam/mi_delete_all.c:
        Fix for new my_chsize()
      myisam/myisampack.c:
        Fix for new my_chsize()
      mysql-test/include/master-slave.inc:
        Better initialization for replication tests
      mysql-test/mysql-test-run.sh:
        Added option --log-warnings
      mysql-test/r/insert.result:
        More tests if INSERT ...(DEFAULT)
      mysql-test/r/rpl000001.result:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/r/rpl000002.result:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/r/rpl000003.result:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/r/rpl000004.result:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/r/rpl000005.result:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/r/rpl000006.result:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/r/rpl000007.result:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/r/rpl000008.result:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/r/rpl000009.result:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/r/rpl000010.result:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/r/rpl000011.result:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/r/rpl000012.result:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/r/rpl000013.result:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/r/rpl000014.result:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/r/rpl_alter.result:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/r/rpl_empty_master_crash.result:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/r/rpl_get_lock.result:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/r/rpl_log.result:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/r/rpl_magic.result:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/r/rpl_mystery22.result:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/r/rpl_skip_error.result:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/r/rpl_sporadic_master.result:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/t/insert.test:
        More tests if INSERT ...(DEFAULT)
      mysql-test/t/rpl000001.test:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/t/rpl000002.test:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/t/rpl000003.test:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/t/rpl000004.test:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/t/rpl000005.test:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/t/rpl000006.test:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/t/rpl000007.test:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/t/rpl000009.test:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/t/rpl000011.test:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/t/rpl000013.test:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/t/rpl000014.test:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/t/rpl_alter.test:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/t/rpl_empty_master_crash.test:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/t/rpl_get_lock.test:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/t/rpl_magic.test:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/t/rpl_mystery22.test:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/t/rpl_skip_error.test:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysql-test/t/rpl_sporadic_master.test:
        Clean up tests for new master-slave.inc
        Remove 'use database'
      mysys/mf_iocache.c:
        More debug info
        Force seek after reinit_io_cache()
      mysys/mf_iocache2.c:
        Added my_b_filelength()
      mysys/my_chsize.c:
        Extended my_chsize() to allow one to specify a filler character.
        (For MySQL index logs)
      mysys/raid.cc:
        Extended my_chsize() to allow one to specify a filler character.
        (For MySQL index logs)
      sql/field.h:
        Fix for INSERT ... (DEFAULT)
      sql/ha_berkeley.h:
        Fix for dynamic variables
      sql/ha_innodb.cc:
        Change sprintf() to my_sprintf() to make code portable.
        Fix after sync with 3.23
        (We still need to fix the storage of the replication position in innodb)
      sql/ha_innodb.h:
        Fix for dynamic variables
      sql/handler.cc:
        Remove writting of COMMIT to the binary log.
        (Now done in MYSQL_LOG::write())
      sql/item_func.cc:
        Query_log_event() now always takes query length.
      sql/item_func.h:
        Indentation cleanup
      sql/item_strfunc.h:
        Indentation cleanup
      sql/item_timefunc.h:
        Indentation cleanup
      sql/lock.cc:
        Check that we own critical mutexes.
      sql/log.cc:
        Big code cleanup / rewrite / optimize.
        - The index log file has its own IO_CACHE object.
        - Many functions totally rewritten to make them smaller and faster.
        - New handling of index log files
        - Lots of new comments
      sql/log_event.cc:
        Code cleanup
        New comments
      sql/log_event.h:
        Query_log_event() now always takes query length.
      sql/mini_client.cc:
        Better error messages on reconnect.
        Fixed wrong variable usage from last commit.
      sql/mysql_priv.h:
        New arguments to open_log()
      sql/mysqld.cc:
        Use setrlimit() to ensure that we can write core file if one specifies --core-file
        Added index file name as parameter to openlog().
        Added --slave-compressed-protocol
        Made 2 the minimum length for ft_min_word_len
      sql/net_serv.cc:
        Use new vio_blocking()
        (The vio_blocking() change was done to make this code more readable)
      sql/repl_failsafe.cc:
        Minor code cleanup
      sql/set_var.cc:
        Added variables slave_compressed_protocol, foreign_key_checks & unique_checks.
      sql/set_var.h:
        Generalization
      sql/slave.cc:
        Code cleanup & rewrite.
        Dont call SELECT VERSION() on check_master_version()
        New init_slave() code.
        Ensure that all threads create a THD early.
        Add locks around manipulation of critical structures
        Don't retry a command more than master_retry_count times.
        Write less warnings to the log file (if not started with --log-warnings)
        Faster flush_relay_log_info()
      sql/slave.h:
        More comments
        Added new arguments to some functions.
      sql/sql_acl.cc:
        More DBUG info
        New parameter to Query_log_event()
      sql/sql_base.cc:
        Added some mutex checking.
      sql/sql_cache.cc:
        Less not critical debug info
      sql/sql_class.h:
        Fix for new log handling.
      sql/sql_db.cc:
        Added mutex around remove_db_from_cache()
      sql/sql_delete.cc:
        Added missing parameters to changed functions
      sql/sql_insert.cc:
        Added missing parameters to changed functions
      sql/sql_parse.cc:
        Do an 'end_active_trans()' before 'load_master_data'
        Changed that SHOW INNODB STATUS requre the SUPER privilege
        Added new function parameters to new functions
      sql/sql_rename.cc:
        Added missing parameters to changed functions
      sql/sql_repl.cc:
        Code cleanups / new comments
        Fix for new find_first_log() calling standard.
        More DBUG statements.
        Show binlogs updated to use new IO_CACHE:d index log file.
      sql/sql_repl.h:
        New function arguments
      sql/sql_select.cc:
        Indentation changes
      sql/sql_table.cc:
        Added missing parameters to changed functions
        Added checking of mutex
        Added mutex around critical regions.
      sql/sql_test.cc:
        Don't use THR_ALARM if the configuration doesn't support it.
      sql/sql_update.cc:
        Added missing parameters to changed functions
      sql/table.cc:
        Added missing parameters to changed functions
      vio/vio.c:
        Extend vio_blocking to return the old state
      vio/viosocket.c:
        Extend vio_blocking to return the old state
      vio/viossl.c:
        Extend vio_blocking to return the old state
      f01f4991
    • monty@mashka.mysql.fi's avatar
      Lots of code fixes to the replication code (especially the binary logging and... · 2c4fa340
      monty@mashka.mysql.fi authored
      Lots of code fixes to the replication code (especially the binary logging and index log file handling)
      Fixed bugs in my last changeset that made MySQL hard to compile.
      Added mutex around some data that could cause table cache corruptions when using OPTIMIZE TABLE / REPAIR TABLE or automatic repair of MyISAM tables.
      Added mutex around some data in the slave start/stop code that could cause THD linked list corruptions
      Extended my_chsize() to allow one to specify a filler character.
      Extend vio_blocking to return the old state (This made some usage of this function much simpler)
      Added testing for some functions that they caller have got the required mutexes before calling the function.
      Use setrlimit() to ensure that we can write core file if one specifies --core-file.
      Added --slave-compressed-protocol
      Made 2 the minimum length for ft_min_word_len
      Added variables foreign_key_checks & unique_checks.
      Less logging from replication code (if not started with --log-warnings)
      Changed that SHOW INNODB STATUS requre the SUPER privilege
      More DBUG statements and a lot of new code comments
      2c4fa340
  10. 18 Jul, 2001 4 commits
    • unknown's avatar
      Fixed bad merge and fixed some wrong test cases · 8e3872f3
      unknown authored
      mysql-test/t/rpl_magic.test:
        Added missing drop table
      mysql-test/t/rpl_mystery22.test:
        Added missing drop table
      mysql-test/t/rpl_sporadic_master.test:
        Fixed bad merge
      8e3872f3
    • monty@hundin.mysql.fi's avatar
      cb59a7f5
    • unknown's avatar
      fixed mysterious offset confusion bug · 76eaa259
      unknown authored
      added a test case for it - took some creative work to figure out
      how to make it happen at will
      updated the manual
      
      
      Docs/manual.texi:
        fixed wrong info on SLAVE_SKIP_COUNTER
        fixed wrong info in BitKeeper tree build instructions
        updated change history about bug fix
      mysql-test/t/rpl_sporadic_master.test:
        tried hard to get slave confused, but failed. nevertheless, a more
        exhaustive test case does not hurt
      sql/slave.cc:
        fixed mysterious offset confusion bug
      76eaa259
    • sasha@mysql.sashanet.com's avatar
      fixed mysterious offset confusion bug · 1c3dc887
      sasha@mysql.sashanet.com authored
      added a test case for it - took some creative work to figure out
      how to make it happen at will
      updated the manual
      1c3dc887
  11. 16 Jul, 2001 2 commits
  12. 11 Jul, 2001 4 commits
    • unknown's avatar
      mysql-test/t/rpl_sporadic_master.test · bc059e42
      unknown authored
          use truncate table
      sql/slave.cc
          fixed race condition on server shutdown
      sql/sql_repl.cc
          fixed uninitialized use of io_cache
      
      
      mysql-test/t/rpl_sporadic_master.test:
        use truncate table
      sql/slave.cc:
        fixed race condition on server shutdown
      sql/sql_repl.cc:
        fixed uninitialized use of io_cache
      bc059e42
    • sasha@mysql.sashanet.com's avatar
      mysql-test/t/rpl_sporadic_master.test · 38d3bf51
      sasha@mysql.sashanet.com authored
          use truncate table
      sql/slave.cc
          fixed race condition on server shutdown
      sql/sql_repl.cc
          fixed uninitialized use of io_cache
      38d3bf51
    • unknown's avatar
      mysql-test/t/rpl_sporadic_master.test · 586648cc
      unknown authored
          fixed test case to produce same results on txn-enabled binary. 
          temporary fix - permanent fix is it make mysqld behave the same with
          MyISAM on auto_increment insert after delete from tbl_name regardless
          of how the binary was compiled
      sql/slave.cc
          fixed concurrency bug with log_seq
      sql/slave.h
          last_log_seq needs to be updated atomically with pos
      sql/sql_repl.cc
          cleared up comment and fixed concurrency bug
      
      
      mysql-test/t/rpl_sporadic_master.test:
        fixed test case to produce same results on txn-enabled binary. 
        temporary fix - permanent fix is it make mysqld behave the same with
        MyISAM on auto_increment insert after delete from tbl_name regardless
        of how the binary was compiled
      sql/slave.cc:
        fixed concurrency bug with log_seq
      sql/slave.h:
        last_log_seq needs to be updated atomically with pos
      sql/sql_repl.cc:
        cleared up comment and fixed concurrency bug
      586648cc
    • sasha@mysql.sashanet.com's avatar
      mysql-test/t/rpl_sporadic_master.test · 5527f9bf
      sasha@mysql.sashanet.com authored
          fixed test case to produce same results on txn-enabled binary. 
          temporary fix - permanent fix is it make mysqld behave the same with
          MyISAM on auto_increment insert after delete from tbl_name regardless
          of how the binary was compiled
      sql/slave.cc
          fixed concurrency bug with log_seq
      sql/slave.h
          last_log_seq needs to be updated atomically with pos
      sql/sql_repl.cc
          cleared up comment and fixed concurrency bug
      5527f9bf
  13. 29 Jun, 2001 2 commits
    • unknown's avatar
      fixed message in post-commit trigger · c7e200cd
      unknown authored
      added debugging options to master to behave sporadically, and a 
      test case to make sure the slave can deal with it
      
      
      BitKeeper/triggers/post-commit:
        fixed message
      sql/mysqld.cc:
        added debugging options to force the master to occasionally break
        replication
      sql/slave.cc:
        cosmetic change to improve readability
      sql/sql_repl.cc:
        support for --sporadic-binlog-dump-fail and --max-binlog-dump-events
      sql/sql_repl.h:
        support for --sporadic-binlog-dump-fail and --max-binlog-dump-events
      c7e200cd
    • sasha@mysql.sashanet.com's avatar
      fixed message in post-commit trigger · 2e4d264c
      sasha@mysql.sashanet.com authored
      added debugging options to master to behave sporadically, and a 
      test case to make sure the slave can deal with it
      2e4d264c