An error occurred fetching the project authors.
  1. 09 Dec, 2013 1 commit
  2. 26 Mar, 2013 1 commit
    • unknown's avatar
      MDEV-26: Global transaction ID · d9f975d0
      unknown authored
      Adjust full test suite to work with GTID.
      
      Huge patch, mainly due to having to update .result file for all SHOW BINLOG
      EVENTS and mysqlbinlog outputs, where the new GTID events pop up.
      
      Everything was painstakingly checked to be still correct and valid .result
      file updates.
      d9f975d0
  3. 27 Sep, 2012 1 commit
    • Sergei Golubchik's avatar
      fixes for test failures · 474fe6d9
      Sergei Golubchik authored
      and small collateral changes
      
      mysql-test/lib/My/Test.pm:
        somehow with "print" we get truncated writes sometimes
      mysql-test/suite/perfschema/r/digest_table_full.result:
        md5 hashes of statement digests differ, because yacc token codes are different in mariadb
      mysql-test/suite/perfschema/r/dml_handler.result:
        host table is not ported over yet
      mysql-test/suite/perfschema/r/information_schema.result:
        host table is not ported over yet
      mysql-test/suite/perfschema/r/nesting.result:
        this differs, because we don't rewrite general log queries, and multi-statement
        packets are logged as a one entry. this result file is identical to what mysql-5.6.5
        produces with the --log-raw option.
      mysql-test/suite/perfschema/r/relaylog.result:
        MariaDB modifies the binlog index file directly, while MySQL 5.6 has a feature "crash-safe binlog index" and modifies a special "crash-safe" shadow copy of the index file and then moves it over. That's why this test shows "NONE" index file writes in MySQL and "MANY" in MariaDB.
      mysql-test/suite/perfschema/r/server_init.result:
        MariaDB initializes the "manager" resources from the "manager" thread, and starts this thread only when --flush-time is not 0. MySQL 5.6 initializes "manager" resources unconditionally on server startup.
      mysql-test/suite/perfschema/r/stage_mdl_global.result:
        this differs, because MariaDB disables query cache when query_cache_size=0. MySQL does not
        do that, and this causes useless mutex locks and waits.
      mysql-test/suite/perfschema/r/statement_digest.result:
        md5 hashes of statement digests differ, because yacc token codes are different in mariadb
      mysql-test/suite/perfschema/r/statement_digest_consumers.result:
        md5 hashes of statement digests differ, because yacc token codes are different in mariadb
      mysql-test/suite/perfschema/r/statement_digest_long_query.result:
        md5 hashes of statement digests differ, because yacc token codes are different in mariadb
      mysql-test/suite/rpl/r/rpl_mixed_drop_create_temp_table.result:
        will be updated to match 5.6 when alfranio.correia@oracle.com-20110512172919-c1b5kmum4h52g0ni and anders.song@greatopensource.com-20110105052107-zoab0bsf5a6xxk2y are merged
      mysql-test/suite/rpl/r/rpl_non_direct_mixed_mixing_engines.result:
        will be updated to match 5.6 when anders.song@greatopensource.com-20110105052107-zoab0bsf5a6xxk2y is merged
      474fe6d9
  4. 13 Feb, 2012 1 commit
  5. 19 Dec, 2010 1 commit
    • 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
  6. 02 Sep, 2010 1 commit
  7. 03 Aug, 2010 1 commit
    • unknown's avatar
      Bug #34283 mysqlbinlog leaves tmpfile after termination if binlog contains load data infile · bcb3170c
      unknown authored
      With statement- or mixed-mode logging, "LOAD DATA INFILE" queries
      are written to the binlog using special types of log events.
      When mysqlbinlog reads such events, it re-creates the file in a
      temporary directory with a generated filename and outputs a
      "LOAD DATA INFILE" query where the filename is replaced by the
      generated file. The temporary file is not deleted by mysqlbinlog
      after termination.
      
      To fix the problem, in mixed mode we go to row-based. In SBR, we
      document it to remind user the tmpfile is left in a temporary
      directory.
      
      
      
      
      mysql-test/extra/rpl_tests/rpl_loaddata.test:
        Updated for Bug#34283
      mysql-test/suite/binlog/r/binlog_mixed_load_data.result:
        Test result for BUG#34283.
      mysql-test/suite/binlog/t/binlog_killed_simulate.test:
        Updated for Bug#34283
      mysql-test/suite/binlog/t/binlog_mixed_load_data.test:
        Added the test file to verify that 'load data infile...' statement
        will go to row-based in mixed mode.
      mysql-test/suite/binlog/t/binlog_stm_blackhole.test:
        Updated for Bug#34283
      mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result:
        Updated for Bug#34283
      mysql-test/suite/rpl/t/rpl_loaddata_fatal.test:
        Updated for Bug#34283
      mysql-test/suite/rpl/t/rpl_loaddata_map.test:
        Updated for Bug#34283
      mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test:
        Updated for Bug#34283
      mysql-test/suite/rpl/t/rpl_stm_log.test:
        Updated for Bug#34283
      sql/sql_load.cc:
        Added code to go to row-based in mixed mode for
        'load data infile ...' statement
      bcb3170c
  8. 04 Jul, 2010 1 commit
    • unknown's avatar
      The following statements support the CURRENT_USER() where a user is needed. · 1a17d7e8
      unknown authored
      DROP USER 
      RENAME USER CURRENT_USER() ...
      GRANT ... TO CURRENT_USER()
      REVOKE ... FROM CURRENT_USER()
      ALTER DEFINER = CURRENT_USER() EVENTbut, When these statements are binlogged, CURRENT_USER() just is binlogged
      as 'CURRENT_USER()', it is not expanded to the real user name. When slave 
      executes the log event, 'CURRENT_USER()' is expand to the user of slave 
      SQL thread, but SQL thread's user name always NULL. This breaks the replication.
      
      After this patch, session's user will be written into query log events 
      if these statements call CURREN_USER() or 'ALTER EVENT' does not assign a definer.
      
      
      mysql-test/include/diff_tables.inc:
        Expend its abilities.
        Now it can diff not only in sessions of 'master' and 'slave', but 
        other sessions as well.
      sql/log_event.cc:
        session's user will be written into Query_log_event, if is_current_user_used() is TRUE.
        On slave SQL thread, Only thd->invoker is written into Query_log_event,
        if it exists.
      sql/sql_acl.cc:
        On slave SQL thread, grantor should copy from thd->invoker, if it exists
      sql/sql_class.h:
        On slave SQL thread, thd->invoker is used to store the applying event's
        invoker.
      1a17d7e8
  9. 28 Jun, 2010 1 commit
  10. 27 Jun, 2010 1 commit
    • unknown's avatar
      The following statements support the CURRENT_USER() where a user is needed. · 451cea3f
      unknown authored
      DROP USER 
      RENAME USER CURRENT_USER() ...
      GRANT ... TO CURRENT_USER()
      REVOKE ... FROM CURRENT_USER()
      ALTER DEFINER = CURRENT_USER() EVENTbut, When these statements are binlogged, CURRENT_USER() just is binlogged
      as 'CURRENT_USER()', it is not expanded to the real user name. When slave 
      executes the log event, 'CURRENT_USER()' is expand to the user of slave 
      SQL thread, but SQL thread's user name always NULL. This breaks the replication.
      
      After this patch, session's user will be written into query log events 
      if these statements call CURREN_USER() or 'ALTER EVENT' does not assign a definer.
      
      
      mysql-test/include/diff_tables.inc:
        Expend its abilities.
        Now it can diff not only in sessions of 'master' and 'slave', but 
        other sessions as well.
      mysql-test/include/rpl_diff_tables.inc:
        Diff the same table between master and slaves.
      sql/log_event.cc:
        session's user will be written into Query_log_event, if is_current_user_used() is TRUE.
        On slave SQL thread, Only thd->variables.current_user is written into Query_log_event,
        if it exists.
      sql/sql_acl.cc:
        On slave SQL thread, grantor should copy from thd->variables.current_user, if it exists
      sql/sql_class.h:
        On slave SQL thread, thd->variables.current_user is used to store the applying event's
        invoker.
      451cea3f
  11. 24 May, 2010 1 commit
    • unknown's avatar
      Bug #49741 test files contain explicit references to bin/relay-log positions · 7e80f1c5
      unknown authored
      Some of the test cases reference to binlog position and
      these position numbers are written into result explicitly.
      It is difficult to maintain if log event format changes. 
      
      There are a couple of cases explicit position number appears, 
      we handle them in different ways
      A. 'CHANGE MASTER ...' with MASTER_LOG_POS or/and RELAY_LOG_POS options
         Use --replace_result to mask them.
      B. 'SHOW BINLOG EVENT ...'
         Replaced by show_binlog_events.inc or wait_for_binlog_event.inc. 
         show_binlog_events.inc file's function is enhanced by given
         $binlog_file and $binlog_limit.
      C. 'SHOW SLAVE STATUS', 'show_slave_status.inc' and 'show_slave_status2.inc'
         For the test cases just care a few items in the result of 'SHOW SLAVE STATUS',
         only the items related to each test case are showed.
         'show_slave_status.inc' is rebuild, only the given items in $status_items
         will be showed.
         'check_slave_is_running.inc' and 'check_slave_no_error.inc'
         and 'check_slave_param.inc' are auxiliary files helping
         to show running status and error information easily.
      
      
      mysql-test/extra/binlog_tests/binlog.test:
        It only cares whether current binlog file index is changed, so it is ok
        with 'show_master_status.inc' instead of 'show mater status'.
      mysql-test/extra/binlog_tests/blackhole.test:
        Use 'show_binlog_events.inc' instead of 'show binlog events' statement.
      mysql-test/extra/rpl_tests/rpl_deadlock.test:
        Use 'check_slave_is_running.inc' instead of 'show_slave_status2.inc'.
      mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test:
        Use 'check_slave_is_running.inc' instead of 'show slave status' statement.
      mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test:
        Use 'wait_for_slave_sql_error.inc' and 'ait_for_slave_sql_error_and_skip.inc' instead of 'show slave status'.
      mysql-test/extra/rpl_tests/rpl_flsh_tbls.test:
        Use 'show_binlog_events.inc' instead of 'show binlog events' statement.
      mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test:
        It is need now to give a error number, so use 'wait_for_slave_io_to_stop.inc'
        instead of 'wait_for_slave_io_error.inc'.
      mysql-test/extra/rpl_tests/rpl_insert_delayed.test:
        Use 'show_binlog_events.inc' instead of 'show binlog events' statement.
      mysql-test/extra/rpl_tests/rpl_log.test:
        Use 'show_binlog_events.inc' instead of 'show binlog events' statement.
        se 'check_slave_is_running.inc' instead of 'show slave status' statement.
      mysql-test/extra/rpl_tests/rpl_max_relay_size.test:
        se 'check_slave_is_running.inc' instead of 'show slave status' statement.
      mysql-test/extra/rpl_tests/rpl_ndb_apply_status.test:
        Use 'show_binlog_events.inc' instead of 'show binlog events' statement.
      mysql-test/extra/rpl_tests/rpl_reset_slave.test:
        Use 'show_slave_status.inc' instead of 'show_slave_status2.inc' statement.
        Use 'check_slave_no_error.inc' to simplify the check that there is no error.
      mysql-test/extra/rpl_tests/rpl_row_basic.test:
        Use 'check_slave_is_running.inc' to verify that Slave threads are running well.
        Use 'wait_for_slave_sql_error.inc' to wait the given sql thread error happening.
      mysql-test/extra/rpl_tests/rpl_row_tabledefs.test:
        Use 'show_slave_error_status_and_skip.inc' instead of 'show slave status'.
      mysql-test/include/check_slave_is_running.inc:
        To make sure both sql and io thread are running well. If not, the test will be aborted.
      mysql-test/include/check_slave_no_error.inc:
        To make sure both sql and io thread have no error. If not, the test will be aborted.
      mysql-test/include/get_relay_log_pos.inc:
        According to the position of a log event in master binlog file,
        find the peer position of a log event in relay log file.
      mysql-test/include/rpl_stmt_seq.inc:
        Use 'show_binlog_events.inc' instead of 'show binlog events' statement.
      mysql-test/include/show_binlog_events.inc:
        Add two options $binlog_file and $binlog_limit for showing binlog events from different binlog files or/and given different limits on position or row number.
      mysql-test/include/show_rpl_debug_info.inc:
        Add 'SELECT NOW()' in the debug information.
      mysql-test/include/show_slave_status.inc:
        It's more clean and tidy Only the given columns of slave status are printed.
      mysql-test/include/test_fieldsize.inc:
        Use 'wait_for_slave_sql_error.inc' to wait the given sql thread error happening.
        There is no need to print the result of 'show slave stutus'.
      mysql-test/include/wait_for_binlog_event.inc:
        Use show_rpl_debug_info.inc instead of 'SHOW BINLOG EVENTS'.
      mysql-test/include/wait_for_slave_io_error.inc:
        Add $slave_io_errno and $show_slave_io_error, it waits only a given error.
      mysql-test/include/wait_for_slave_param.inc:
        Use die instead of exit.
      mysql-test/include/wait_for_slave_sql_error.inc:
        Add $slave_sql_errno and $show_slave_sql_error, it waits only a given error.
      mysql-test/include/wait_for_status_var.inc:
        Use die instead of exit.
      mysql-test/r/flush_block_commit_notembedded.result:
        It checks whether somethings are binlogged, so we using 'show_binlog_event.inc' instead of 'show master status'.
      mysql-test/r/multi_update.result:
        It checks whether somethings are binlogged, so we using 'show_binlog_event.inc' instead of 'show master status'.
      mysql-test/suite/binlog/r/binlog_innodb.result:
        It checks whether somethings are binlogged, so we using 'show_binlog_event.inc' instead of 'show master status'.
      mysql-test/suite/binlog/r/binlog_row_binlog.result:
        Position in the result of 'show master status' is replaced by '#'.
      mysql-test/suite/binlog/r/binlog_stm_binlog.result:
        Position in the result of 'show master status' is replaced by '#'.
      mysql-test/suite/binlog/t/binlog_innodb.test:
        It checks whether somethings are binlogged, so we use 'show_binlog_event.inc' instead of 'show master status'.
      mysql-test/suite/binlog/t/binlog_stm_binlog.test:
        Use 'show_binlog_events.inc' instead of 'show binlog events' statement.
      mysql-test/suite/bugs/r/rpl_bug36391.result:
        Position in the result of 'show master status' is replaced by '#'.
      mysql-test/suite/bugs/t/rpl_bug12691.test:
        Use 'show_binlog_events.inc' instead of 'show binlog events' statement.
      mysql-test/suite/bugs/t/rpl_bug36391.test:
        'show master status' is replaced by 'show_master_status.inc'.
        Position in the result of 'show master status' is replaced by '#'.
      mysql-test/suite/engines/funcs/r/rpl_000015.result:
        It checks whether somethings are binlogged, 
        so we using 'show_binlog_event.inc' instead of 'show master status'.
      mysql-test/suite/engines/funcs/t/rpl_000015.test:
        Use 'check_slave_is_running.inc' to verify that Slave threads are running well.
      mysql-test/suite/engines/funcs/t/rpl_REDIRECT.test:
        Use 'query_vertical SHOW SLAVE STATUS' instead of 'show slave status'.
        There is no status columns in the result file, for no slave exists on master's server.
      mysql-test/suite/engines/funcs/t/rpl_change_master.test:
        This test just care whether Read_Master_Log_Pos is equal to Exec_Master_Log_Pos after 'CHANGE MASTER ..'. So 'show slave status' is removed and just check the value of Read_Master_Log_Pos and Exec_Master_Log_Pos.
      mysql-test/suite/engines/funcs/t/rpl_empty_master_crash.test:
        We doesn't really need the statement.
      mysql-test/suite/engines/funcs/t/rpl_flushlog_loop.test:
        Just show Relay_Log_File, running status and error informations.
        Use 'check_slave_is_running.inc' to verify that Slave threads are running well.
      mysql-test/suite/engines/funcs/t/rpl_loaddata_s.test:
        Use 'show_binlog_events.inc' instead of 'show binlog events' statement.
      mysql-test/suite/engines/funcs/t/rpl_log_pos.test:
        Mask the explicit positions in the result file.
        Use 'check_slave_no_error.inc' to simplify the check that there is no error.
        Use 'wait_for_slave_sql_error.inc' to wait the given sql thread error happening.
        There is no need to print the result of 'show slave stutus'.
      mysql-test/suite/engines/funcs/t/rpl_rbr_to_sbr.test:
        Use 'show_binlog_events.inc' instead of 'show binlog events' statement.
      mysql-test/suite/engines/funcs/t/rpl_row_drop.test:
        Use 'show_binlog_events.inc' instead of 'show binlog events' statement.
      mysql-test/suite/engines/funcs/t/rpl_row_inexist_tbl.test:
        Use 'wait_for_slave_sql_error.inc' to wait the given sql thread error happening.
        There is no need to print the result of 'show slave stutus'.
      mysql-test/suite/engines/funcs/t/rpl_row_until.test:
        Use 'check_slave_param.inc' to check whether SQL Thread stop at a right position, and use binlog position variables instead of explicit number in the 'CHANGE MASTER' statements.
        
        Mask the explicit binary log positions in the result file.
      mysql-test/suite/engines/funcs/t/rpl_server_id1.test:
        Use 'wait_for_slave_sql_error.inc' to wait the given sql thread error happening.
        There is no need to print the result of 'show slave stutus'.
        Use 'check_slave_no_error.inc' to simplify the check that there is no error.
      mysql-test/suite/engines/funcs/t/rpl_server_id2.test:
        It doesn't really need in this test.
      mysql-test/suite/engines/funcs/t/rpl_slave_status.test:
        Use 'wait_for_slave_sql_error.inc' to wait the given sql thread error happening.
        There is no need to print the result of 'show slave stutus'.
      mysql-test/suite/engines/funcs/t/rpl_switch_stm_row_mixed.test:
        Use 'show_binlog_events.inc' instead of 'show binlog events' statement.
      mysql-test/suite/manual/t/rpl_replication_delay.test:
        Use 'show_slave_status.inc' instead of 'show slave status'.
      mysql-test/suite/parts/t/rpl_partition.test:
        Use 'check_slave_is_running.inc' instead of 'show slave status' statement.
      mysql-test/suite/rpl/include/rpl_mixed_ddl.inc:
        Use 'show_binlog_events.inc' instead of 'show binlog events' statement.
      mysql-test/suite/rpl/include/rpl_mixed_dml.inc:
        Use 'show_binlog_events.inc' instead of 'show binlog events' statement.
      mysql-test/suite/rpl/t/rpl_000015.test:
        Use 'show_slave_status.inc' instead of 'show_slave_status2.inc'.
      mysql-test/suite/rpl/t/rpl_binlog_grant.test:
        Use 'wait_for_binlog_event.inc' instead of 'show binlog events' statement.
      mysql-test/suite/rpl/t/rpl_bug33931.test:
        Use 'wait_for_slave_sql_error.inc' to wait the given sql thread error happening.
        There is no need to print the result of 'show slave stutus'.
      mysql-test/suite/rpl/t/rpl_change_master.test:
        This test just care whether Read_Master_Log_Pos is equal to Exec_Master_Log_Pos after 'CHANGE MASTER ..'. So 'show slave status' is removed and just check the value of Read_Master_Log_Pos and Exec_Master_Log_Pos.
      mysql-test/suite/rpl/t/rpl_critical_errors.test:
        Use 'wait_for_slave_sql_error.inc' to wait the given sql thread error happening.
        There is no need to print the result of 'show slave stutus'.
      mysql-test/suite/rpl/t/rpl_dual_pos_advance.test:
        Mask the explicit position numbers in result file.
        It is restricted running on SBR, for it want to binlog 'set @A=1' statement.
      mysql-test/suite/rpl/t/rpl_empty_master_crash.test:
        It doesn't need in this test.
      mysql-test/suite/rpl/t/rpl_flushlog_loop.test:
        UUse 'check_slave_is_running.inc' and 'show_slave_status.inc' instead of 'show slave status' statement.
      mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test:
        Use 'wait_for_slave_io_error.inc' to wait the given io thread error happening.
      mysql-test/suite/rpl/t/rpl_grant.test:
        It doesn't need in this test.
      mysql-test/suite/rpl/t/rpl_incident.test:
        Use 'check_slave_is_running.inc' instead of 'show slave status' statement.
      mysql-test/suite/rpl/t/rpl_known_bugs_detection.test:
        Use 'wait_for_slave_sql_error.inc' to wait the given sql thread error happening.
        There is no need to print the result of 'show slave stutus'.
      mysql-test/suite/rpl/t/rpl_loaddata_fatal.test:
        Use 'wait_for_slave_sql_error_and_skip.inc' to wait the given sql thread error happening and then skip the event. There is no need to print the result of 'show slave stutus'.
      mysql-test/suite/rpl/t/rpl_log_pos.test:
        Use 'wait_for_slave_io_error.inc' to wait the given io thread error happening.
        There is no need to print the result of 'show slave status'.
      mysql-test/suite/rpl/t/rpl_rbr_to_sbr.test:
        Use 'show_binlog_events.inc' instead of 'show binlog events' statement.
      mysql-test/suite/rpl/t/rpl_replicate_do.test:
        Use 'show_slave_status.inc' instead of 'show slave status'.
      mysql-test/suite/rpl/t/rpl_rotate_logs.test:
        Use 'show_slave_status.inc' instead of 'show_slave_status2.inc'.
      mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test:
        Use 'show_binlog_events.inc' instead of 'show binlog events' statement.
      mysql-test/suite/rpl/t/rpl_row_create_table.test:
        Use 'show_binlog_events.inc' instead of 'show binlog events' statement.
      mysql-test/suite/rpl/t/rpl_row_drop.test:
        Use 'show_binlog_events.inc' instead of 'show binlog events' statement.
      mysql-test/suite/rpl/t/rpl_row_until.test:
        Use 'check_slave_param.inc' to check whether SQL Thread stop at a right position, and use binlog position variables instead of explicit number in the 'CHANGE MASTER' statements.
      mysql-test/suite/rpl/t/rpl_skip_error.test:
        Use 'check_slave_is_running.inc' instead of 'show slave status' statement.
      mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test:
        Use 'wait_for_slave_sql_error.inc' to wait the given sql thread error happening.
        There is no need to print the result of 'show slave status'.
      mysql-test/suite/rpl/t/rpl_slave_skip.test:
        Use 'check_slave_param.inc' to check whether SQL Thread stop at a right position, and mask the explicit position number in the 'CHANGE MASTER' statements.
      mysql-test/suite/rpl/t/rpl_sp.test:
        Use 'show_binlog_events.inc' instead of 'show binlog events' statement.
      mysql-test/suite/rpl/t/rpl_ssl.test:
        Use 'show_slave_status.inc' instead of 'show slave status'.
      mysql-test/suite/rpl/t/rpl_ssl1.test:
        Use 'show_slave_status.inc' instead of 'show slave status'.
      mysql-test/suite/rpl/t/rpl_stm_until.test:
        Use 'check_slave_param.inc' to check whether SQL Thread stop at a right position, and use binlog position variables instead of explicit number in the 'CHANGE MASTER' statements.
      mysql-test/suite/rpl/t/rpl_temporary_errors.test:
        Use 'check_slave_is_running.inc' instead of 'show slave status' statement.
      mysql-test/suite/rpl_ndb/t/rpl_ndb_basic.test:
        Use 'wait_for_slave_sql_error.inc' to wait the given sql thread error happening.
        There is no need to print the result of 'show slave status'.
      mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test:
        Use 'check_slave_is_running.inc' instead of 'show slave status' statement.
      mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test:
        Use 'check_slave_is_running.inc' instead of 'show slave status' statement.
      mysql-test/suite/rpl_ndb/t/rpl_ndb_idempotent.test:
        Use 'check_slave_is_running.inc' instead of 'show slave status' statement.
      mysql-test/suite/rpl_ndb/t/rpl_ndb_multi.test:
        Mask master_log_pos and master_log_file
      mysql-test/suite/rpl_ndb/t/rpl_ndb_sync.test:
        Use 'check_slave_is_running.inc' instead of 'show slave status' statement.
      mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb.test:
        Use 'show_binlog_events.inc' instead of 'show binlog events' statement.
      mysql-test/t/alter_table-big.test:
        Use 'show_binlog_events.inc' instead of 'show binlog events' statement.
      mysql-test/t/create-big.test:
        Use 'show_binlog_events.inc' instead of 'show binlog events' statement.
      mysql-test/t/ctype_cp932_binlog_stm.test:
        Use 'show_binlog_events.inc' instead of 'show binlog events' statement.
      mysql-test/t/flush_block_commit_notembedded.test:
        It checks whether somethings are binlogged, 
        so we using 'show_binlog_event.inc' instead of 'show master status'.
      mysql-test/t/multi_update.test:
        It checks whether somethings are binlogged, 
        so we using 'wait_binlog_event.inc' instead of 'show master status'.
      mysql-test/t/sp_trans_log.test:
        Use 'show_binlog_events.inc' instead of 'show binlog events' statement.
      7e80f1c5
  12. 28 Mar, 2010 1 commit
    • unknown's avatar
      Bug #50407 mysqlbinlog --database=X produces bad output for SAVEPOINTs · 454c003a
      unknown authored
      When mysqlbinlog was given the --database=X flag, it always printed
      'ROLLBACK TO', but the corresponding 'SAVEPOINT' statement was not
      printed. The replicated filter(replicated-do/ignore-db) and binlog
      filter (binlog-do/ignore-db) has the same problem. They are solved
      in this patch together.
      
      After this patch, We always check whether the query is 'SAVEPOINT'
      statement or not. Because this is a literal check, 'SAVEPOINT' and
      'ROLLBACK TO' statements are also binlogged in uppercase with no
      any comments.
      
      The binlog before this patch can be handled correctly except one case
      that any comments are in front of the keywords. for example:
       /* bla bla */ SAVEPOINT a;
       /* bla bla */ ROLLBACK TO a;
      454c003a
  13. 02 Feb, 2010 1 commit
    • Alexander Nozdrin's avatar
      Revert a patch for Bug#48231, which introduced valgrind warnings. · 59f1be1b
      Alexander Nozdrin authored
      Original revision:
      ------------------------------------------------------------
      revision-id: li-bing.song@sun.com-20100130124925-o6sfex42b6noyc6x
      parent: joro@sun.com-20100129145427-0n79l9hnk0q43ajk
      committer: <Li-Bing.Song@sun.com>
      branch nick: mysql-5.1-bugteam
      timestamp: Sat 2010-01-30 20:49:25 +0800
      message:
        Bug #48321  CURRENT_USER() incorrectly replicated for DROP/RENAME USER;
                    REVOKE/GRANT; ALTER EVENT.
        
        The following statements support the CURRENT_USER() where a user is needed.
          DROP USER 
          RENAME USER CURRENT_USER() ...
          GRANT ... TO CURRENT_USER()
          REVOKE ... FROM CURRENT_USER()
          ALTER DEFINER = CURRENT_USER() EVENT
        but, When these statements are binlogged, CURRENT_USER() just is binlogged
        as 'CURRENT_USER()', it is not expanded to the real user name. When slave 
        executes the log event, 'CURRENT_USER()' is expand to the user of slave 
        SQL thread, but SQL thread's user name always NULL. This breaks the replication.
        
        After this patch, All above statements are rewritten when they are binlogged.
        The CURRENT_USER() is expanded to the real user's name and host.
      ------------------------------------------------------------
      59f1be1b
  14. 30 Jan, 2010 1 commit
    • unknown's avatar
      Bug #48321 CURRENT_USER() incorrectly replicated for DROP/RENAME USER; · d9e9a73e
      unknown authored
                  REVOKE/GRANT; ALTER EVENT.
      
      The following statements support the CURRENT_USER() where a user is needed.
        DROP USER 
        RENAME USER CURRENT_USER() ...
        GRANT ... TO CURRENT_USER()
        REVOKE ... FROM CURRENT_USER()
        ALTER DEFINER = CURRENT_USER() EVENT
      but, When these statements are binlogged, CURRENT_USER() just is binlogged
      as 'CURRENT_USER()', it is not expanded to the real user name. When slave 
      executes the log event, 'CURRENT_USER()' is expand to the user of slave 
      SQL thread, but SQL thread's user name always NULL. This breaks the replication.
      
      After this patch, All above statements are rewritten when they are binlogged.
      The CURRENT_USER() is expanded to the real user's name and host.
      d9e9a73e
  15. 06 Dec, 2009 1 commit
    • Luis Soares's avatar
      BUG#49479: Slave stops with syntax error: LOAD DATA event without · 59571928
      Luis Soares authored
      escaped field names
      
      When in mixed or statement mode, the master logs LOAD DATA
      queries by resorting to an Execute_load_query_log_event. This
      event does not contain the original query, but a rewritten
      version of it, which includes the table field names. However, the
      rewrite does not escape the field names. If these names match a
      reserved keyword, then the slave will stop with a syntax error
      when executing the event.
      
      We fix this by escaping the fields names as it happens already
      for the table name.
      
      mysql-test/extra/rpl_tests/rpl_loaddata.test:
        Added test case for the reported bug.
      mysql-test/r/mysqlbinlog.result:
        Changed result to support escaped field name.
      mysql-test/suite/binlog/r/binlog_killed_simulate.result:
        Changed result to support escaped field name.
      mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result:
        Changed result to support escaped field name.
      mysql-test/suite/binlog/r/binlog_stm_blackhole.result:
        Changed result to support escaped field name.
      mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
        Changed result to support escaped field name.
      mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result:
        Changed result to support escaped field name.
      mysql-test/suite/rpl/r/rpl_loaddata.result:
        Added result for new test. 
        Changed show slave status positions which are now different because of
        extra escape character in field names.
      mysql-test/suite/rpl/r/rpl_loaddata_fatal.result:
        Changed show slave status positions which are now different because of
        extra escape character.
      mysql-test/suite/rpl/r/rpl_loaddata_map.result:
        Changed result to support escaped field name.
      mysql-test/suite/rpl/r/rpl_stm_log.result:
        Changed result to support escaped field name.
      mysql-test/t/mysqlbinlog.test:
        Changed positions which is now different because of extra escape 
        character in field names.
      sql/sql_load.cc:
        Appended escape characters before and after field names.
      59571928
  16. 03 Nov, 2009 1 commit
    • Alfranio Correia's avatar
      WL#2687 WL#5072 BUG#40278 BUG#47175 · 19c380aa
      Alfranio Correia authored
      Non-transactional updates that take place inside a transaction present problems
      for logging because they are visible to other clients before the transaction
      is committed, and they are not rolled back even if the transaction is rolled
      back. It is not always possible to log correctly in statement format when both
      transactional and non-transactional tables are used in the same transaction.
      
      In the current patch, we ensure that such scenario is completely safe under the
      ROW and MIXED modes.
      19c380aa
  17. 28 Sep, 2009 1 commit
    • Tatiana A. Nurnberg's avatar
      Bug#43746: YACC return wrong query string when parse 'load data infile' sql statement · 4102363f
      Tatiana A. Nurnberg authored
      "load data" statements were written to the binlog as a mix of the original statement
      and bits recreated from parse-info. This relied on implementation details and broke
      with IGNORE_SPACES and versioned comments.
      
      We now completely resynthesize the query for LOAD DATA for binlog (which among other
      things normalizes them somewhat with regard to case, spaces, etc.).
      We have already parsed the query properly, so we make use of that rather
      than mix-and-match string literals and parsed items.
      This should make us safe with regard to versioned comments, even those
      spanning multiple tokens. Also no longer affected by IGNORE_SPACES.
      
      mysql-test/r/mysqlbinlog.result:
        LOAD DATA INFILE normalized
      mysql-test/suite/binlog/r/binlog_killed_simulate.result:
        LOAD DATA INFILE normalized
      mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result:
        LOAD DATA INFILE normalized
      mysql-test/suite/binlog/r/binlog_stm_blackhole.result:
        LOAD DATA INFILE normalized
      mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
        LOAD DATA INFILE normalized
      mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result:
        LOAD DATA INFILE normalized
      mysql-test/suite/rpl/r/rpl_loaddata.result:
        LOAD DATA INFILE normalized
      mysql-test/suite/rpl/r/rpl_loaddata_fatal.result:
        LOAD DATA INFILE normalized; offsets adjusted to reflect that
      mysql-test/suite/rpl/r/rpl_loaddata_map.result:
        LOAD DATA INFILE normalized
      mysql-test/suite/rpl/r/rpl_loaddatalocal.result:
        test for #43746 - trying to break LOAD DATA part of parser
      mysql-test/suite/rpl/r/rpl_stm_log.result:
        LOAD DATA INFILE normalized
      mysql-test/suite/rpl/t/rpl_loaddatalocal.test:
        try to break the LOAD DATA part of the parser (test for #43746)
      mysql-test/t/mysqlbinlog.test:
        LOAD DATA INFILE normalized; adjust offsets to reflect that
      sql/log_event.cc:
        clean up Load_log_event::print_query and friends so they don't print
        excess spaces. add support for printing charset names to print_query.
      sql/log_event.h:
        We already have three places where we synthesize LOAD DATA queries.
        Better use one of those!
      sql/sql_lex.h:
        When binlogging LOAD DATA statements, we make up the statement to
        be logged (from the parse-info, rather than substrings of the
        original query) now. Consequently, we no longer need (string-)
        pointers into the original query.
      sql/sql_load.cc:
        Completely rewrote write_execute_load_query_log_event() to synthesize the
        LOAD DATA statement wholesale, rather than piece it together from
        synthesized bits and literal excerpts from the original query. This
        will not only give us a nice, normalized statement (all uppercase,
        no excess spaces, etc.), it will also handle comments, including
        versioned comments right, which is certainly more than we can say
        about the previous incarnation.
      sql/sql_yacc.yy:
        We're no longer assembling LOAD DATA statements from bodyparts of the
        original query, so some bookkeeping in the parser can go.
      4102363f
  18. 29 Aug, 2009 1 commit
    • unknown's avatar
      Bug #44331 Restore of database with events produces warning in replication · f32c08bd
      unknown authored
      If an EVENT is created without the DEFINER clause set explicitly or with it set  
      to CURRENT_USER, the master and slaves become inconsistent. This issue stems from 
      the fact that in both cases, the DEFINER is set to the CURRENT_USER of the current 
      thread. On the master, the CURRENT_USER is the mysqld's user, while on the slave,  
      the CURRENT_USER is empty for the SQL Thread which is responsible for executing 
      the statement.
      
      To fix the problem, we do what follows. If the definer is not set explicitly,  
      a DEFINER clause is added when writing the query into binlog; if 'CURRENT_USER' is 
      used as the DEFINER, it is replaced with the value of the current user before 
      writing to binlog.
      
      mysql-test/suite/rpl/r/rpl_create_if_not_exists.result:
        Updated the result file after fixing bug#44331
      mysql-test/suite/rpl/r/rpl_drop_if_exists.result:
        Updated the result file after fixing bug#44331
      mysql-test/suite/rpl/r/rpl_events.result:
        Test result of Bug#44331
      mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result:
        Updated the result file after fixing bug#44331
      mysql-test/suite/rpl/t/rpl_events.test:
        Added test to verify if the definer is consistent between master and slave
        when the event is created without the DEFINER clause set explicitly or the
        DEFINER is set to CURRENT_USER
      sql/events.cc:
        The "create_query_string" function is added to create a new query string 
        for removing executable comments.
      sql/sql_yacc.yy:
        The remember_name token was added for recording the offset of EVENT_SYM.
      f32c08bd
  19. 26 Aug, 2009 1 commit
    • Alfranio Correia's avatar
      BUG#28976 Mixing trans and non-trans tables in one transaction results in incorrect · 6c2b3251
      Alfranio Correia authored
      binlog
      
      Mixing transactional (T) and non-transactional (N) tables on behalf of a
      transaction may lead to inconsistencies among masters and slaves in STATEMENT
      mode. The problem stems from the fact that although modifications done to
      non-transactional tables on behalf of a transaction become immediately visible
      to other connections they do not immediately get to the binary log and therefore
      consistency is broken. Although there may be issues in mixing T and M tables in
      STATEMENT mode, there are safe combinations that clients find useful.
      
      In this bug, we fix the following issue. Mixing N and T tables in multi-level
      (e.g. a statement that fires a trigger) or multi-table table statements (e.g.
      update t1, t2...) were not handled correctly. In such cases, it was not possible
      to distinguish when a T table was updated if the sequence of changes was N and T.
      In a nutshell, just the flag "modified_non_trans_table" was not enough to reflect
      that both a N and T tables were changed. To circumvent this issue, we check if an
      engine is registered in the handler's list and changed something which means that
      a T table was modified.
      
      Check WL 2687 for a full-fledged patch that will make the use of either the MIXED or
      ROW modes completely safe.
      
      mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result:
        Truncate statement is wrapped in BEGIN/COMMIT.
      mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
        Truncate statement is wrapped in BEGIN/COMMIT.
      6c2b3251
  20. 10 Feb, 2009 1 commit
    • Mats Kindahl's avatar
      BUG#36763: TRUNCATE TABLE fails to replicate when stmt-based binlogging is not supported. · 9b612d2c
      Mats Kindahl authored
      Post-merge fixes. Changes to some result sets.
      
      mysql-test/r/commit_1innodb.result:
        TRUNCATE TABLE does not cause the binary log to do commits any more.
      mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result:
        TRUNCATE TABLE is not transactional, hence does not have BEGIN/COMMIT around itself.
      mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
        TRUNCATE TABLE is not transactional, hence does not have BEGIN/COMMIT around itself.
      mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result:
        TRUNCATE TABLE is not transactional, hence does not have BEGIN/COMMIT around itself.
      mysql-test/suite/rpl/r/rpl_truncate_2myisam.result:
        STOP SLAVE was replaced with include file.
      mysql-test/suite/rpl/r/rpl_truncate_3innodb.result:
        STOP SLAVE was replaced with include file.
      9b612d2c
  21. 11 Aug, 2008 1 commit
    • Mattias Jonsson's avatar
      Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that · f50c4207
      Mattias Jonsson authored
      partition is corrupt
      
      The main problem was that ALTER TABLE t ANALYZE/CHECK/OPTIMIZE/REPAIR
      PARTITION took another code path (over mysql_alter_table instead of
      mysql_admin_table) which differs in two ways:
      1) alter table opens the tables in a different way than admin tables do
         resulting in returning with error before it tried the command
      2) alter table does not start to send any diagnostic rows to the client
         which the lower admin functions continue to use -> resulting in
         assertion crash
      
      The fix:
      Remapped ALTER TABLE t ANALYZE/CHECK/OPTIMIZE/REPAIR PARTITION to use
      the same code path as ANALYZE/CHECK/OPTIMIZE/REPAIR TABLE t.
      Adding check in mysql_admin_table to setup the partition list for
      which partitions that should be used.
      
      
      Partitioned tables will still not work with
      REPAIR TABLE/PARTITION USE_FRM, since that requires moving partitions
      to tables, REPAIR TABLE t USE_FRM, and check that the data still
      fulfills the partitioning function and then move the table back to
      being a partition.
      
      NOTE: I have removed the following functions from the handler
      interface:
      analyze_partitions, check_partitions, optimize_partitions,
      repair_partitions
      Since they are not longer needed.
      THIS ALTERS THE STORAGE ENGINE API
      
      mysql-test/r/handler_innodb.result:
        Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that
        partition is corrupt
        
        Added a note result row.
      mysql-test/r/innodb.result:
        Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that
        partition is corrupt
        
        Added a note result row.
      mysql-test/r/innodb_mysql.result:
        Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that
        partition is corrupt
        
        Added a note result row.
      mysql-test/r/partition.result:
        Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that
        partition is corrupt
        
        Updated after fixing ANALYZE/CHECK/OPTIMIZE/REPAIR partitioned
        tables.
      mysql-test/r/trigger-trans.result:
        Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that
        partition is corrupt
        
        Added a note result row.
      mysql-test/suite/ndb/r/ndb_partition_key.result:
        Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that
        partition is corrupt
        
        Updated after fixing ANALYZE/CHECK/OPTIMIZE/REPAIR partitioned
        tables.
      mysql-test/suite/ndb/t/ndb_partition_key.test:
        Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that
        partition is corrupt
        
        Updated after fixing ANALYZE/CHECK/OPTIMIZE/REPAIR partitioned
        tables.
      mysql-test/suite/parts/inc/partition_alter4.inc:
        Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that
        partition is corrupt
        
        Updated after fixing ANALYZE/CHECK/OPTIMIZE/REPAIR partitioned
        tables.
      mysql-test/suite/parts/r/partition_alter4_innodb.result:
        Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that
        partition is corrupt
        
        Updated after fixing ANALYZE/CHECK/OPTIMIZE/REPAIR partitioned
        tables.
      mysql-test/suite/parts/r/partition_alter4_myisam.result:
        Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that
        partition is corrupt
        
        Updated after fixing ANALYZE/CHECK/OPTIMIZE/REPAIR partitioned
        tables.
      mysql-test/suite/rpl/r/rpl_failed_optimize.result:
        Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that
        partition is corrupt
        
        Added a note result row.
      mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result:
        Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that
        partition is corrupt
        
        Added a note result row.
      mysql-test/t/partition.test:
        Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that
        partition is corrupt
        
        Updated after fixing ANALYZE/CHECK/OPTIMIZE/REPAIR partitioned
        tables.
      sql/ha_partition.cc:
        Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that
        partition is corrupt
        
        Added a function for returning admin commands result rows
        Updated handle_opt_partitions to handle admin commands result rows,
        and some error filtering (as mysql_admin_table do).
        
        Removed the functions analyze/check/optimize/repair_partitions
        since they have no longer any use.
      sql/ha_partition.h:
        Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that
        partition is corrupt
        
        Removed analyze/check/optimize/repair_partitions since they
        are no longer are needed.
      sql/handler.cc:
        Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that
        partition is corrupt
        
        Removed analyze/check/optimize/repair_partitions since they
        are no longer are needed.
      sql/handler.h:
        Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that
        partition is corrupt
        
        Removed analyze/check/optimize/repair_partitions since they
        are no longer are needed.
      sql/mysql_priv.h:
        Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that
        partition is corrupt
        
        Added set_part_state for reuse of code in mysql_admin_table.
        (Originally fond in sql/sql_partition.cc:prep_alter_part_table)
      sql/protocol.cc:
        Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that
        partition is corrupt
        
        Added one assert and a debug print.
      sql/sql_partition.cc:
        Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that
        partition is corrupt
        
        Refactored code for setting up partition state, set_part_state,
        now used in both prep_alter_part_table and
        sql_table.cc:mysql_admin_table.
        Removed code for handling ANALYZE/CHECK/OPTIMIZE/REPAIR partitions,
        since it is now handled by mysql_admin_table.
      sql/sql_table.cc:
        Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that
        partition is corrupt
        
        Added functionality in mysql_admin_table to work with partitioned
        tables.
        Fixed a possible assertion bug for HA_ADMIN_TRY_ALTER
        (If analyze would output a row, it fails since the row was already
        started).
      sql/sql_yacc.yy:
        Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that
        partition is corrupt
        
        Remapped ALTER TABLE t ANALYZE/CHECK/OPTIMIZE/REPAIR PARTITION
        to use the same code path as ANALYZE/CHECK/OPTIMIZE/REPAIR TABLE
        instead of taking the ALTER TABLE path.
        Added reset of alter_info for ANALYZE/CHECK/OPTIMIZE/REPAIR TABLE
        since it is now used by partitioned tables.
      storage/myisam/mi_check.c:
        Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that
        partition is corrupt
        
        Changed warning message from "Found X parts  Should be: Y parts"
        to "Found X key parts. Should be Y", since it could be confusing
        with partitioned tables.
      f50c4207
  22. 04 Jul, 2008 1 commit
    • Sven Sandberg's avatar
      BUG#37858: loaddata,rpl_slave_skip,rpl_innodb_mixed_dml fail if datafile not world-readable · fb17cbe4
      Sven Sandberg authored
      Problem 1: main.loaddata tried to trigger an error caused by
      reading files outside the vardir, by reading itself. However,
      if loaddata.test is not world-readable (e.g., umask=0077),
      then another error is triggered.
      Fix 1: allow the other error too.
      Problem 2: rpl_slave_skip and rpl_innodb_mixed_dml tried to
      copy a file from mysql-test/suite/rpl/data to mysql-test/var
      and then read it. That failed too if umask=0077, since the
      file would not become world-readable.
      Fix 2: move the files from mysql-test/suite/rpl/data to
      mysql-test/std_data and update tests accordingly. Remove
      the directory mysql-test/suite/rpl/data.
      
      
      mysql-test/r/loaddata.result:
        Updated result file.
      mysql-test/std_data/rpl_bug28618.dat:
        Moved this file to std_data.
      mysql-test/std_data/rpl_mixed.dat:
        Moved this file to std_data.
      mysql-test/suite/rpl/data:
        Removed directory that is now unused.
      mysql-test/suite/rpl/include/rpl_mixed_dml.inc:
        The rpl_mixed.dat file has been moved. Updated the test to
        use the new location.
      mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result:
        Updated result file.
      mysql-test/suite/rpl/r/rpl_slave_skip.result:
        Updated result file.
      mysql-test/suite/rpl/t/rpl_slave_skip.test:
        The rpl_bug28618.dat file has been moved. Updated the test
        to use the new location.
      mysql-test/t/loaddata.test:
        Allow more error messages. ER_TEXTFILE_NOT_READABLE may
        happen if the file is not world-readable (which may happen,
        e.g., if the user has umask=0077).
      fb17cbe4
  23. 16 May, 2008 1 commit
    • unknown's avatar
      Fix merge problems and re-record output for legitimate changes. · 7d53cbc3
      unknown authored
      mysql-test/r/ctype_cp932_binlog_stm.result:
        New offsets because of quote marks.
      mysql-test/r/mysqlbinlog.result:
        Re-add variables removed in merge at file-vers 1.47.
      mysql-test/suite/binlog/r/binlog_database.result:
        create_string() output changes the quoting and inserts newlines.
      mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result:
        Change in quoting.
      mysql-test/suite/rpl/r/rpl_sp.result:
        Adds quotes and newlines in creation of routines in binlog.
      7d53cbc3
  24. 14 Dec, 2007 1 commit
    • unknown's avatar
      BUG#26395: if crash during autocommit update to transactional table on master, slave fails · 44efa9c1
      unknown authored
      Now, every transaction (including autocommit transactions) starts with
      a BEGIN and ends with a COMMIT/ROLLBACK in the binlog.
      Added a test case, and updated lots of test case result files.
      
      
      mysql-test/r/multi_update.result:
        Updated result file
      mysql-test/r/sp_trans_log.result:
        Updated result file
      mysql-test/suite/binlog/r/binlog_innodb.result:
        Updated result file
      mysql-test/suite/binlog/r/binlog_multi_engine.result:
        Updated result file
      mysql-test/suite/binlog/r/binlog_stm_blackhole.result:
        Updated result file
      mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
        Updated result file
      mysql-test/suite/ndb/r/ndb_binlog_format.result:
        Updated result file
      mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result:
        Updated result file
      mysql-test/suite/rpl/r/rpl_row_charset_innodb.result:
        Updated result file
      mysql-test/suite/rpl/r/rpl_row_create_table.result:
        Updated result file
      mysql-test/suite/rpl/r/rpl_row_log_innodb.result:
        Updated result file
      mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result:
        Updated result file
      mysql-test/suite/rpl/r/rpl_truncate_3innodb.result:
        Updated result file
      mysql-test/suite/rpl/t/rpl_row_create_table.test:
        Updated result file
      mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result:
        Updated result file
      sql/log.cc:
         - Always write BEGIN and COMMIT around statements, even in autocommit
           mode.
         - Added comments for binlog_commit and binlog_rollback.
      sql/log_event.cc:
        Added debug trigger to avoid writing xid events to the binlog.
      mysql-test/suite/rpl_ndb/r/rpl_ndb_transaction.result:
        Results for new test case
      mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction-master.opt:
        Options for new test case
      mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction-slave.opt:
        Options for new test case
      mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test:
        Added new test case.
      44efa9c1
  25. 12 Dec, 2007 1 commit
    • unknown's avatar
      WL#4189 · 1370500c
      unknown authored
       - dynamic configuration support
       - safe process
       - cleanups
       - create new suite for fedarated
      
      
      BitKeeper/deleted/.del-basic.test:
        Rename: mysql-test/ndb/basic.test -> BitKeeper/deleted/.del-basic.test
      BitKeeper/deleted/.del-basic_log.result:
        Rename: mysql-test/ndb/basic_log.result -> BitKeeper/deleted/.del-basic_log.result
      mysql-test/suite/federated/federated_transactions.result:
        Rename: mysql-test/r/federated_transactions.result -> mysql-test/suite/federated/federated_transactions.result
      BitKeeper/deleted/.del-have_bug25714.require:
        Rename: mysql-test/r/have_bug25714.require -> BitKeeper/deleted/.del-have_bug25714.require
      BitKeeper/deleted/.del-kill_master.sh:
        Rename: mysql-test/misc/kill_master.sh -> BitKeeper/deleted/.del-kill_master.sh
      BitKeeper/deleted/.del-ndb_config_4_node.ini~d8e572e9b68f933a:
        Rename: mysql-test/ndb/ndb_config_4_node.ini -> BitKeeper/deleted/.del-ndb_config_4_node.ini~d8e572e9b68f933a
      BitKeeper/deleted/.del-restart.result:
        Rename: mysql-test/ndb/restart.result -> BitKeeper/deleted/.del-restart.result
      mysql-test/suite/federated/federated_cleanup.inc:
        Rename: mysql-test/include/federated_cleanup.inc -> mysql-test/suite/federated/federated_cleanup.inc
      mysql-test/suite/rpl/t/rpl_rotate_logs-slave.opt:
        Rename: mysql-test/suite/rpl/t/rpl_rotate_logs.slave-mi -> mysql-test/suite/rpl/t/rpl_rotate_logs-slave.opt
      BitKeeper/deleted/.del-install_test_db.sh:
        Rename: mysql-test/install_test_db.sh -> BitKeeper/deleted/.del-install_test_db.sh
      BitKeeper/deleted/.del-ndb_config_1_node.ini~7ec640ed25570e16:
        Rename: mysql-test/ndb/ndb_config_1_node.ini -> BitKeeper/deleted/.del-ndb_config_1_node.ini~7ec640ed25570e16
      BitKeeper/deleted/.del-mtr_timer.pl:
        Rename: mysql-test/lib/mtr_timer.pl -> BitKeeper/deleted/.del-mtr_timer.pl
      BitKeeper/deleted/.del-create-test-result:
        Rename: mysql-test/create-test-result -> BitKeeper/deleted/.del-create-test-result
      BitKeeper/deleted/.del-fix-result:
        Rename: mysql-test/fix-result -> BitKeeper/deleted/.del-fix-result
      BitKeeper/deleted/.del-mysql-test-run-shell.sh:
        Rename: mysql-test/mysql-test-run-shell.sh -> BitKeeper/deleted/.del-mysql-test-run-shell.sh
      BitKeeper/deleted/.del-mysql-test_V1.9.pl:
        Rename: mysql-test/misc/mysql-test_V1.9.pl -> BitKeeper/deleted/.del-mysql-test_V1.9.pl
      BitKeeper/deleted/.del-resolve-stack:
        Rename: mysql-test/resolve-stack -> BitKeeper/deleted/.del-resolve-stack
      BitKeeper/deleted/.del-restart_log.result:
        Rename: mysql-test/ndb/restart_log.result -> BitKeeper/deleted/.del-restart_log.result
      mysql-test/suite/rpl/t/rpl_000015-slave.opt:
        Rename: mysql-test/suite/rpl/t/rpl_000015.slave-mi -> mysql-test/suite/rpl/t/rpl_000015-slave.opt
      BitKeeper/deleted/.del-ndb_config_2_node.ini:
        Rename: mysql-test/ndb/ndb_config_2_node.ini -> BitKeeper/deleted/.del-ndb_config_2_node.ini
      BitKeeper/deleted/.del-ndbcluster.sh:
        Rename: mysql-test/ndb/ndbcluster.sh -> BitKeeper/deleted/.del-ndbcluster.sh
      BitKeeper/deleted/.del-basic.result:
        Rename: mysql-test/ndb/basic.result -> BitKeeper/deleted/.del-basic.result
      BitKeeper/deleted/.del-restart.test:
        Rename: mysql-test/ndb/restart.test -> BitKeeper/deleted/.del-restart.test
      BitKeeper/deleted/.del-have_bug25714.inc:
        Rename: mysql-test/include/have_bug25714.inc -> BitKeeper/deleted/.del-have_bug25714.inc
      BitKeeper/deleted/.del-mtr_diff.pl:
        Rename: mysql-test/lib/mtr_diff.pl -> BitKeeper/deleted/.del-mtr_diff.pl
      mysql-test/suite/federated/federated_transactions-slave.opt:
        Rename: mysql-test/t/federated_transactions-slave.opt -> mysql-test/suite/federated/federated_transactions-slave.opt
      BitKeeper/deleted/.del-Makefile.am~343467da4d0f211b:
        Rename: mysql-test/ndb/Makefile.am -> BitKeeper/deleted/.del-Makefile.am~343467da4d0f211b
      BitKeeper/deleted/.del-mtr_im.pl~9762b0336c28949:
        Rename: mysql-test/lib/mtr_im.pl -> BitKeeper/deleted/.del-mtr_im.pl~9762b0336c28949
      mysql-test/suite/federated/federated_innodb-slave.opt:
        Rename: mysql-test/t/federated_innodb-slave.opt -> mysql-test/suite/federated/federated_innodb-slave.opt
      client/mysqltest.c:
        Use current files path first when looking for include file
      configure.in:
        Remove mysql-test/nbd
      mysql-test/Makefile.am:
        Cleanup mysql-test/Makefile.am
      mysql-test/extra/binlog_tests/blackhole.test:
        Use new paths
      mysql-test/extra/binlog_tests/ctype_ucs_binlog.test:
        Use new paths
      mysql-test/mysql-test-run.pl:
        Dynamic configuration support
        Safe process
      mysql-test/extra/binlog_tests/mix_innodb_myisam_side_effects.test:
        Use new paths
      mysql-test/extra/rpl_tests/rpl_EE_err.test:
        Use new paths
      mysql-test/extra/rpl_tests/rpl_loaddata.test:
        Use new paths
      mysql-test/extra/rpl_tests/rpl_log.test:
        Use new paths
      mysql-test/extra/rpl_tests/rpl_row_001.test:
        Use new paths
      mysql-test/extra/rpl_tests/rpl_row_charset.test:
        Use new paths
      mysql-test/extra/rpl_tests/rpl_stm_000001.test:
        Use new paths
      mysql-test/extra/rpl_tests/rpl_stm_charset.test:
        Use new paths
      mysql-test/include/have_blackhole.inc:
        Use new paths
      mysql-test/include/have_ndbapi_examples.inc:
        Use new paths
      mysql-test/include/loaddata_autocom.inc:
        Use new paths
      mysql-test/include/mix1.inc:
        Use new paths
      mysql-test/include/ndb_backup.inc:
        Use new paths
      mysql-test/include/ndb_restore_master.inc:
        Use new paths
      mysql-test/include/ndb_restore_slave_eoption.inc:
        Use new paths
      mysql-test/include/testdb_only.inc:
        Use new paths
      mysql-test/lib/My/Config.pm:
        dynamic configuration
        safe process
        cleanups
      mysql-test/lib/mtr_cases.pm:
        dynamic configuration
        safe process
        cleanups
      mysql-test/lib/mtr_io.pl:
        dynamic configuration
        safe process
        cleanups
      mysql-test/lib/mtr_misc.pl:
        dynamic configuration
        safe process
        cleanups
      mysql-test/lib/mtr_process.pl:
        dynamic configuration
        safe process
        cleanups
      mysql-test/lib/mtr_report.pl:
        dynamic configuration
        safe process
        cleanups
      mysql-test/lib/mtr_stress.pl:
        dynamic configuration
        safe process
        cleanups
      mysql-test/r/backup.result:
        Use new paths
      mysql-test/r/ctype_big5.result:
        Use new paths
      mysql-test/r/gis.result:
        Use new paths
      mysql-test/r/loaddata.result:
        Use new paths
      mysql-test/r/loaddata_autocom_innodb.result:
        Use new paths
      mysql-test/r/mysqlbinlog.result:
        Use new paths
      mysql-test/r/mysqlbinlog_base64.result:
        Use new paths
      mysql-test/r/outfile.result:
        Use new paths
      mysql-test/r/partition_error.result:
        Use new paths
      mysql-test/r/partition_not_windows.result:
        Use new paths
      mysql-test/r/partition_symlink.result:
        Use new paths
      mysql-test/r/query_cache.result:
        Use new paths
      mysql-test/r/sp.result:
        Use new paths
      mysql-test/r/symlink.result:
        Use new paths
      mysql-test/r/system_mysql_db.result:
        Use new paths
      mysql-test/r/trigger.result:
        Use new paths
      mysql-test/r/type_blob.result:
        Use new paths
      mysql-test/r/view.result:
        Use new paths
      mysql-test/r/warnings.result:
        Use new paths
      mysql-test/suite/binlog/r/binlog_killed_simulate.result:
        Use new paths
      mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result:
        Use new paths
      mysql-test/suite/binlog/r/binlog_stm_blackhole.result:
        Use new paths
      mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
        Use new paths
      mysql-test/suite/binlog/t/binlog_killed.test:
        Use new paths
      mysql-test/suite/binlog/t/binlog_killed_simulate.test:
        Use new paths
      mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam.test:
        Use new paths
      mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test:
        Use new paths
      mysql-test/suite/federated/federated.inc:
        Use new paths
      mysql-test/suite/federated/federated.result:
        Use new paths
      mysql-test/suite/federated/federated.test:
        Use new paths
      mysql-test/suite/federated/federated_archive.result:
        Use new paths
      mysql-test/suite/federated/federated_archive.test:
        Use new paths
      mysql-test/suite/federated/federated_bug_13118.result:
        Use new paths
      mysql-test/suite/federated/federated_bug_13118.test:
        Use new paths
      mysql-test/suite/federated/federated_bug_25714.result:
        Use new paths
      mysql-test/suite/federated/federated_bug_25714.test:
        Use new paths
      mysql-test/suite/federated/federated_innodb.result:
        Use new paths
      mysql-test/suite/federated/federated_innodb.test:
        Use new paths
      mysql-test/suite/federated/federated_server.result:
        Use new paths
      mysql-test/suite/federated/federated_server.test:
        Use new paths
      mysql-test/suite/federated/federated_transactions.test:
        Use new paths
      mysql-test/suite/federated/have_federated_db.inc:
        Use new paths
      mysql-test/suite/ndb/r/loaddata_autocom_ndb.result:
        Use new paths
      mysql-test/suite/ndb/r/ndb_config.result:
        Use new paths
      mysql-test/suite/ndb/r/ndb_dd_backuprestore.result:
        Use new paths
      mysql-test/suite/ndb/r/ndb_load.result:
        Use new paths
      mysql-test/suite/ndb/r/ndb_loaddatalocal.result:
        Use new paths
      mysql-test/suite/ndb/r/ndb_replace.result:
        Use new paths
      mysql-test/suite/ndb/r/ndb_restore.result:
        Use new paths
      mysql-test/suite/ndb/r/ndb_restore_partition.result:
        Use new paths
      mysql-test/suite/ndb/r/ndb_restore_print.result:
        Use new paths
      mysql-test/suite/ndb/r/ndb_trigger.result:
        Use new paths
      mysql-test/suite/ndb/t/ndb_alter_table.test:
        Use new paths
      mysql-test/suite/ndb/t/ndb_config.test:
        Use new paths
      mysql-test/suite/ndb/t/ndb_load.test:
        Use new paths
      mysql-test/suite/ndb/t/ndb_loaddatalocal.test:
        Use new paths
      mysql-test/suite/ndb/t/ndb_replace.test:
        Use new paths
      mysql-test/suite/ndb/t/ndb_restore.test:
        Use new paths
      mysql-test/suite/ndb/t/ndb_single_user.test:
        Use new paths
      mysql-test/suite/ndb/t/ndb_trigger.test:
        Use new paths
      mysql-test/suite/ndb/t/ndbapi.test:
        Use new paths
      mysql-test/suite/rpl/include/rpl_mixed_dml.inc:
        Use new paths
      mysql-test/suite/rpl/r/rpl_LD_INFILE.result:
        Use new paths
      mysql-test/suite/rpl/r/rpl_flushlog_loop.result:
        Use new paths
      mysql-test/suite/rpl/r/rpl_innodb.result:
        Use new paths
      mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result:
        Use new paths
      mysql-test/suite/rpl/r/rpl_load_table_from_master.result:
        Use new paths
      mysql-test/suite/rpl/r/rpl_loaddata.result:
        Use new paths
      mysql-test/suite/rpl/r/rpl_loaddata_charset.result:
        Use new paths
      mysql-test/suite/rpl/r/rpl_loaddata_fatal.result:
        Use new paths
      mysql-test/suite/rpl/r/rpl_loaddata_m.result:
        Use new paths
      mysql-test/suite/rpl/r/rpl_loaddata_s.result:
        Use new paths
      mysql-test/suite/rpl/r/rpl_loaddata_simple.result:
        Use new paths
      mysql-test/suite/rpl/r/rpl_loaddatalocal.result:
        Use new paths
      mysql-test/suite/rpl/r/rpl_loadfile.result:
        Use new paths
      mysql-test/suite/rpl/r/rpl_misc_functions.result:
        Use new paths
      mysql-test/suite/rpl/r/rpl_replicate_do.result:
        Use new paths
      mysql-test/suite/rpl/r/rpl_rewrt_db.result:
        Use new paths
      mysql-test/suite/rpl/r/rpl_row_001.result:
        Use new paths
      mysql-test/suite/rpl/r/rpl_row_loaddata_m.result:
        Use new paths
      mysql-test/suite/rpl/r/rpl_row_log.result:
        Use new paths
      mysql-test/suite/rpl/r/rpl_row_log_innodb.result:
        Use new paths
      mysql-test/suite/rpl/r/rpl_row_stop_middle_update.result:
        Use new paths
      mysql-test/suite/rpl/r/rpl_stm_000001.result:
        Use new paths
      mysql-test/suite/rpl/r/rpl_stm_log.result:
        Use new paths
      mysql-test/suite/rpl/r/rpl_timezone.result:
        Use new paths
      mysql-test/suite/rpl/t/disabled.def:
        Use new paths
      mysql-test/suite/rpl/t/rpl000017-slave.sh:
        Use new paths
      mysql-test/suite/rpl/t/rpl_LD_INFILE.test:
        Use new paths
      mysql-test/suite/rpl/t/rpl_drop_db.test:
        Use new paths
      mysql-test/suite/rpl/t/rpl_flushlog_loop-master.opt:
        Use new paths
      mysql-test/suite/rpl/t/rpl_flushlog_loop-slave.opt:
        Use new paths
      mysql-test/suite/rpl/t/rpl_flushlog_loop.test:
        Use new paths
      mysql-test/suite/rpl/t/rpl_innodb.test:
        Use new paths
      mysql-test/suite/rpl/t/rpl_innodb_bug30919.test:
        Use new paths
      mysql-test/suite/rpl/t/rpl_load_from_master.test:
        Use new paths
      mysql-test/suite/rpl/t/rpl_load_table_from_master.test:
        Use new paths
      mysql-test/suite/rpl/t/rpl_loaddata_charset.test:
        Use new paths
      mysql-test/suite/rpl/t/rpl_loaddata_fatal.test:
        Use new paths
      mysql-test/suite/rpl/t/rpl_loaddata_m.test:
        Use new paths
      mysql-test/suite/rpl/t/rpl_loaddata_s.test:
        Use new paths
      mysql-test/suite/rpl/t/rpl_loaddata_simple.test:
        Use new paths
      mysql-test/suite/rpl/t/rpl_loaddatalocal.test:
        Use new paths
      mysql-test/suite/rpl/t/rpl_loadfile.test:
        Use new paths
      mysql-test/suite/rpl/t/rpl_misc_functions.test:
        Use new paths
      mysql-test/suite/rpl/t/rpl_replicate_do.test:
        Use new paths
      mysql-test/suite/rpl/t/rpl_rewrt_db.test:
        Use new paths
      mysql-test/suite/rpl/t/rpl_rotate_logs-master.opt:
        Use new paths
      mysql-test/suite/rpl/t/rpl_rotate_logs.test:
        Use new paths
      mysql-test/suite/rpl/t/rpl_row_charset_innodb.test:
        Use new paths
      mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test:
        Use new paths
      mysql-test/suite/rpl/t/rpl_row_stop_middle_update.test:
        Use new paths
      mysql-test/suite/rpl/t/rpl_timezone.test:
        Use new paths
      mysql-test/suite/rpl/t/rpl_trigger.test:
        Use new paths
      mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_advance.result:
        Use new paths
      mysql-test/suite/rpl_ndb/r/rpl_ndb_innodb_trans.result:
        Use new paths
      mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result:
        Use new paths
      mysql-test/suite/rpl_ndb/r/rpl_ndb_multi.result:
        Use new paths
      mysql-test/suite/rpl_ndb/r/rpl_ndb_row_001.result:
        Use new paths
      mysql-test/suite/rpl_ndb/r/rpl_ndb_sync.result:
        Use new paths
      mysql-test/suite/rpl_ndb/t/rpl_ndb_bank.test:
        Use new paths
      mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_advance.test:
        Use new paths
      mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb_trans.test:
        Use new paths
      mysql-test/suite/rpl_ndb/t/rpl_ndb_load.test:
        Use new paths
      mysql-test/suite/rpl_ndb/t/rpl_ndb_sync.test:
        Use new paths
      mysql-test/suite/rpl_ndb/t/rpl_ndbapi_multi.test:
        Use new paths
      mysql-test/t/backup.test:
        Use new paths
      mysql-test/t/bootstrap.test:
        Use new paths
      mysql-test/t/crash_commit_before.test:
        Use new paths
      mysql-test/t/create_not_windows.test:
        Use new paths
      mysql-test/t/csv.test:
        Use new paths
      mysql-test/t/ctype_big5.test:
        Use new paths
      mysql-test/t/disabled.def:
        Use new paths
      mysql-test/t/distinct.test:
        Use new paths
      mysql-test/t/gis.test:
        Use new paths
      mysql-test/t/grant_cache_no_prot.test:
        Use new paths
      mysql-test/t/grant_cache_ps_prot.test:
        Use new paths
      mysql-test/t/information_schema_chmod.test:
        Use new paths
      mysql-test/t/loaddata.test:
        Use new paths
      mysql-test/t/log_state.test:
        Use new paths
      mysql-test/t/myisam-system.test:
        Use new paths
      mysql-test/t/mysql_upgrade.test:
        Use new paths
      mysql-test/t/mysqlbinlog-cp932.test:
        Use new paths
      mysql-test/t/mysqlbinlog.test:
        Use new paths
      mysql-test/t/mysqlbinlog2.test:
        Use new paths
      mysql-test/t/mysqlbinlog_base64.test:
        Use new paths
      mysql-test/t/mysqldump.test:
        Use new paths
      mysql-test/t/outfile.test:
        Use new paths
      mysql-test/t/partition.test:
        Use new paths
      mysql-test/t/partition_error.test:
        Use new paths
      mysql-test/t/partition_federated.test:
        Use new paths
      mysql-test/t/partition_mgm.test:
        Use new paths
      mysql-test/t/partition_not_windows.test:
        Use new paths
      mysql-test/t/partition_symlink.test:
        Use new paths
      mysql-test/t/query_cache.test:
        Use new paths
      mysql-test/t/repair.test:
        Use new paths
      mysql-test/t/show_check.test:
        Use new paths
      mysql-test/t/sp-destruct.test:
        Use new paths
      mysql-test/t/sp.test:
        Use new paths
      mysql-test/t/symlink.test:
        Use new paths
      mysql-test/t/system_mysql_db.test:
        Use new paths
      mysql-test/t/system_mysql_db_fix30020.test:
        Use new paths
      mysql-test/t/system_mysql_db_fix40123.test:
        Use new paths
      mysql-test/t/system_mysql_db_fix50030.test:
        Use new paths
      mysql-test/t/system_mysql_db_fix50117.test:
        Use new paths
      mysql-test/t/trigger-compat.test:
        Use new paths
      mysql-test/t/trigger-grant.test:
        Use new paths
      mysql-test/t/trigger.test:
        Use new paths
      mysql-test/t/type_blob.test:
        Use new paths
      mysql-test/t/type_varchar.test:
        Use new paths
      mysql-test/t/upgrade.test:
        Use new paths
      mysql-test/t/user_var-binlog.test:
        Use new paths
      mysql-test/t/varbinary.test:
        Use new paths
      mysql-test/t/view.test:
        Use new paths
      mysql-test/t/warnings.test:
        Use new paths
      mysql-test/lib/My/ConfigFactory.pm:
        Initial version
      mysql-test/lib/My/Find.pm:
        Initial version
      mysql-test/lib/My/SafeProcess.pm:
        Initial version
      mysql-test/std_data/ndb_config_config.ini:
        Add "old" style config.ini for ndb
      mysql-test/suite/federated/disabled.def:
        Move disabled federated to it's new suite
      mysql-test/suite/federated/my.cnf:
        Add config for federated
      mysql-test/suite/ndb/my.cnf:
        Add config for ndb
      mysql-test/suite/rpl/my.cnf:
        Add config for rpl
      mysql-test/suite/rpl/rpl_1slave_base.cnf:
        Add base config for rpl
      mysql-test/suite/rpl/t/rpl_000015-master.opt:
        Use new paths
      mysql-test/suite/rpl_ndb/my.cnf:
        Add config for rpl_ndb
      mysql-test/lib/My/File/Path.pm:
        Initial version
      mysql-test/lib/My/SafeProcess/Base.pm:
        Initial version
      mysql-test/lib/My/SafeProcess/safe_kill_win.cc:
        Initial version
      mysql-test/lib/My/SafeProcess/safe_process.pl:
        Initial version
      mysql-test/lib/My/SafeProcess/safe_process_win.cc:
        Initial version
      mysql-test/lib/t/Base.t:
        Initial version
      mysql-test/lib/t/Find.t:
        Initial version
      mysql-test/lib/t/SafeProcess.t:
        Initial version
      mysql-test/lib/t/SafeProcessStress.pl:
        Initial version
      mysql-test/lib/t/copytree.t:
        Initial version
      mysql-test/lib/t/dummyd.pl:
        Initial version
      mysql-test/lib/t/rmtree.t:
        Initial version
      mysql-test/lib/t/testMyConfig.t:
        Initial version
      mysql-test/lib/t/testMyConfigFactory.t:
        Initial version
      mysql-test/lib/t/test_child.pl:
        Initial version
      mysql-test/include/default_my.cnf:
        Add default config file used when no suite specific file is found
      mysql-test/include/default_mysqld.cnf:
        New BitKeeper file ``mysql-test/include/default_mysqld.cnf''
      mysql-test/include/default_ndbd.cnf:
        Add default settings for all ndbds
      mysql-test/lib/mtr_settings.pl:
        Initial version
      1370500c
  26. 16 Oct, 2007 1 commit
    • unknown's avatar
      Fix for non-deterministic behavior of SELECTs and VIEWs · 828801bb
      unknown authored
      mysql-test/suite/rpl/include/rpl_mixed_check_select.inc:
        Added ORDER BY for SELECT
      mysql-test/suite/rpl/include/rpl_mixed_check_view.inc:
        Added ORDER BY for VIEW
      mysql-test/suite/rpl/include/rpl_mixed_dml.inc:
        Added ORDER BY for SELECT
      mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result:
        Updated result file
      828801bb
  27. 23 Aug, 2007 1 commit
    • unknown's avatar
      Bug#28744, Bug#29363 · e81734ce
      unknown authored
      mysql-test/suite/rpl/include/rpl_mixed_ddl.inc:
        updated main test for DDL
      mysql-test/suite/rpl/include/rpl_mixed_dml.inc:
        updated main test for DML
      mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result:
        updated result file
      mysql-test/suite/rpl/t/disabled.def:
        updated disabled.def
      e81734ce
  28. 20 Aug, 2007 1 commit
    • unknown's avatar
      Bug#29363 · 86c92997
      unknown authored
      mysql-test/suite/rpl/include/rpl_mixed_dml.inc:
        removed file_id,block_len from SHOW BINLOG EVENTS
      mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result:
        updated result file
      86c92997
  29. 01 Aug, 2007 1 commit
    • unknown's avatar
      Fix for Bug#28744, bug#29363 · 92e04b7f
      unknown authored
      mysql-test/suite/rpl/include/rpl_mixed_dml.inc:
        Data file moved into var directory
      mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result:
        updated result file
      mysql-test/suite/rpl/t/disabled.def:
        updated file disabled.def
      92e04b7f
  30. 29 Jun, 2007 1 commit
    • unknown's avatar
      Bug#29363 · eb36fd97
      unknown authored
      mysql-test/suite/rpl/include/rpl_mixed_ddl.inc:
        removed Server version from SHOW BINLOG EVENTS
      mysql-test/suite/rpl/include/rpl_mixed_dml.inc:
        removed Server version from SHOW BINLOG EVENTS
      mysql-test/suite/rpl/r/rpl_innodb_mixed_ddl.result:
        updated result file
      mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result:
        updated result file
      mysql-test/suite/rpl/t/rpl_innodb_mixed_ddl.test:
        skip test for row/statement
      mysql-test/suite/rpl/t/rpl_innodb_mixed_dml.test:
        skip test for row/statement
      eb36fd97
  31. 29 Mar, 2007 1 commit
    • unknown's avatar
      WL#3629 - Replication of Invocation and Invoked Features · af26b2b8
      unknown authored
        
      This patch corrects errors that occurred in a local manual merge.
      It adds the originator column in the results of the SHOW EVENTS command
      for a series of tests.
      
      The only code change is to correct references to the classname in
      enums.
      
      
      mysql-test/r/events.result:
        WL#3629 - Replication of Invocation and Invoked Features
          
        This patch corrects errors that occurred in a local manual merge.
        It adds the originator column in the results of the SHOW EVENTS command.
      mysql-test/r/events_bugs.result:
        WL#3629 - Replication of Invocation and Invoked Features
          
        This patch corrects errors that occurred in a local manual merge.
        It adds the originator column in the results of the SHOW EVENTS command.
      mysql-test/r/events_time_zone.result:
        WL#3629 - Replication of Invocation and Invoked Features
          
        This patch corrects errors that occurred in a local manual merge.
        It adds the originator column in the results of the SHOW EVENTS command.
      mysql-test/r/mysqldump.result:
        WL#3629 - Replication of Invocation and Invoked Features
          
        This patch corrects errors that occurred in a local manual merge.
        It adds the originator column in the results of the SHOW EVENTS command.
      mysql-test/r/ps.result:
        WL#3629 - Replication of Invocation and Invoked Features
          
        This patch corrects errors that occurred in a local manual merge.
        It adds the originator column in the results of the SHOW EVENTS command.
      mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result:
        WL#3629 - Replication of Invocation and Invoked Features
          
        This patch corrects errors that occurred in a local manual merge.
        It adds the originator column in the results of the SHOW EVENTS command.
      sql/event_data_objects.cc:
        WL#3629 - Replication of Invocation and Invoked Features
          
        This patch corrects errors that occurred in a local manual merge.
        It adds the classname to the enums appearing in another patch.
      af26b2b8
  32. 08 Feb, 2007 1 commit
    • unknown's avatar
      updates caused by 5.1.16 · fc71108a
      unknown authored
      BitKeeper/etc/ignore:
        Added mysql-test/partitions.log mysql-test/rpl.log to the ignore list
      fc71108a
  33. 06 Feb, 2007 1 commit
    • unknown's avatar
      copy from test-extra-5.1 to main tree · ee5eb8bb
      unknown authored
      BitKeeper/etc/ignore:
        Added mysql-test/suite/funcs_1/r/innodb_views.warnings mysql-test/suite/funcs_1/r/memory_trig_03e.warnings mysql-test/suite/funcs_1/r/memory_views.warnings mysql-test/suite/funcs_1/r/myisam_trig_03e.warnings mysql-test/suite/funcs_1/r/myisam_views.warnings mysql-test/suite/funcs_1/r/ndb_trig_03e.warnings mysql-test/suite/funcs_1/r/ndb_views.warnings mysql-test/suite/partitions/r/diff mysql-test/suite/partitions/r/partition_bit_ndb.warnings mysql-test/suite/partitions/r/partition_special_innodb.warnings mysql-test/suite/partitions/r/partition_special_myisam.warnings storage/archive/archive_reader mysql-test/suite/funcs_1/r/innodb_trig_03e.warnings to the ignore list
      mysql-test/suite/funcs_2/include/check_charset.inc:
        inserted newline at the end of file.
      mysql-test/suite/objects/include/drop_all.inc:
        inserted newline at the end of file.
      mysql-test/suite/partitions/include/partition_key_32col.inc:
        inserted newline at the end of file.
      mysql-test/suite/rpl/data/rpl_mixed.dat:
        inserted newline at the end of file.
      mysql-test/suite/rpl/include/rpl_mixed_check_event.inc:
        inserted newline at the end of file.
      mysql-test/suite/rpl/include/rpl_mixed_check_select.inc:
        inserted newline at the end of file.
      mysql-test/suite/rpl/include/rpl_mixed_check_user.inc:
        inserted newline at the end of file.
      mysql-test/suite/rpl/include/rpl_mixed_check_view.inc:
        inserted newline at the end of file.
      ee5eb8bb