An error occurred fetching the project authors.
  1. 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
  2. 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
  3. 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
  4. 16 Mar, 2009 1 commit
    • Leonard Zhou's avatar
      BUG#22504 load data infile sql statement in replication architecture get error · b42c29cf
      Leonard Zhou authored
      The problem is issued because we set wrong start position and stop position of query string into binlog.
      That two values are stored as part of head info of query string.
      When we parse binlog, we first get position values then get the query string according position values.
      But seems that two values are not calculated correctly after the parse of Yacc.
      
      We don't want to touch so much of yacc because it may influence other codes.
      So just add one space after 'INTO' key word when parsing.
      This can easily resolve the problem.
      
      mysql-test/suite/rpl/r/rpl_loaddatalocal.result:
        Test result
      mysql-test/suite/rpl/t/rpl_loaddatalocal.test:
        Test case
      sql/log_event.cc:
        Add space after 'INTO'.
      b42c29cf
  5. 02 Feb, 2009 1 commit
    • Serge Kozlov's avatar
      Post-merge patch for extra/rpl_test/rpl_log.test: · 56fa0959
      Serge Kozlov authored
      Remove size of binlog file from SHOW BINARY LOGS. 
      Changing size of binlog file is an affect of adding or removing events to/from
      binlog and it can be checked in next command of test: SHOW BINLOG EVENTS.
      For SHOW BINARY LOGS statement enough to show the list of file names.
      56fa0959
  6. 29 Oct, 2008 1 commit
    • Mats Kindahl's avatar
      Post-merge fixes to fix test cases. · 1f6e419d
      Mats Kindahl authored
      mysql-test/extra/rpl_tests/rpl_log.test:
        Using RESET MASTER in the middle of a sequence of statements cause
        a race condition between the dump thread sending the preceeding
        statements to the slave and the RESET MASTER.
      mysql-test/suite/federated/federated.test:
        Fixing include paths.
      mysql-test/suite/federated/federated_bug_25714.test:
        Removing extreneous lines added by merge.
      mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test:
        Correcting typo (the spaces following the connection name was included as part of the name).
      mysql-test/t/distinct.test:
        Correcting paths.
      1f6e419d
  7. 07 Oct, 2008 1 commit
    • Mats Kindahl's avatar
      Post-merge fixes. · 1a062509
      Mats Kindahl authored
      mysql-test/extra/rpl_tests/rpl_log.test:
        Removing extreneous start slave.
        Added missing drop of table t1.
      mysql-test/suite/rpl/t/rpl_binlog_query_filter_rules.test:
        Replaced $MYSQLTEST_VARDIR/log with $MYSQLD_DATADIR
      mysql-test/suite/rpl/t/rpl_misc_functions.test:
        Using temporary table instead to remove need for drop table.
      1a062509
  8. 15 Aug, 2008 1 commit
    • He Zhenxing's avatar
      post fixes after merge · 5e4d34d7
      He Zhenxing authored
      mysql-test/suite/binlog/r/binlog_killed_simulate.result:
        update result
      mysql-test/suite/rpl/r/rpl_stm_log.result:
        update result
      mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test:
        correct a typo
      5e4d34d7
  9. 29 Jul, 2008 1 commit
    • Sven Sandberg's avatar
      BUG#38068: binlog_stm_binlog fails sporadically in pushbuild · c6bf7ead
      Sven Sandberg authored
      Post-push fix: updated some result files that were affected
      by the previous fix to this bug.
      
      
      mysql-test/suite/binlog/r/binlog_killed_simulate.result:
        Updated result file.
      mysql-test/suite/binlog/r/binlog_row_binlog.result:
        Updated result file.
      mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result:
        Updated result file.
      mysql-test/suite/binlog/r/binlog_statement_insert_delayed.result:
        Updated result file.
      mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
        Updated result file.
      mysql-test/suite/rpl/r/rpl_stm_log.result:
        Updated result file.
      c6bf7ead
  10. 10 Jul, 2008 1 commit
    • Sven Sandberg's avatar
      BUG#37975: wait_for_slave_* should increase the timeout · 6e695369
      Sven Sandberg authored
      Problem 1: tests often fail in pushbuild with a timeout when waiting
      for the slave to start/stop/receive error.
      Fix 1: Updated the wait_for_slave_* macros in the following way:
      - The timeout is increased by a factor ten
      - Refactored the macros so that wait_for_slave_param does the work for
      the other macros.
      Problem 2: Tests are often incorrectly written, lacking a
      source include/wait_for_slave_to_[start|stop].inc.
      Fix 2: Improved the chance to get it right by adding
      include/start_slave.inc and include/stop_slave.inc, and updated tests
      to use these.
      Problem 3: The the built-in test language command
      wait_for_slave_to_stop is a misnomer (does not wait for the slave io
      thread) and does not give as much debug info in case of failure as
      the otherwise equivalent macro
      source include/wait_for_slave_sql_to_stop.inc
      Fix 3: Replaced all calls to the built-in command by a call to the
      macro.
      Problem 4: Some, but not all, of the wait_for_slave_* macros had an
      implicit connection slave. This made some tests confusing to read,
      and made it more difficult to use the macro in circular replication
      scenarios, where the connection named master needs to wait.
      Fix 4: Removed the implicit connection slave from all
      wait_for_slave_* macros, and updated tests to use an explicit
      connection slave where necessary.
      Problem 5: The macros wait_slave_status.inc and wait_show_pattern.inc
      were unused. Moreover, using them is difficult and error-prone.
      Fix 5: remove these macros.
      Problem 6: log_bin_trust_function_creators_basic failed when running
      tests because it assumed @@global.log_bin_trust_function_creators=1,
      and some tests modified this variable without resetting it to its
      original value.
      Fix 6: All tests that use this variable have been updated so that
      they reset the value at end of test.
      
      
      mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test:
        Replaced wait_for_slave_to_stop by include/wait_for_slave_sql_to_stop.inc
      mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test:
        Replaced wait_for_slave_to_stop by include/wait_for_slave_sql_to_stop.inc
        Added connection slave since includ/wait_for_slave_sql_to_stop.inc
        does not do that anymore.
      mysql-test/extra/rpl_tests/rpl_log.test:
        Replaced start slave+wait_slave_status by start_slave.inc
      mysql-test/include/reset_master_and_slave.inc:
        replaced start/stop slave by start_slave.inc/stop_slave.inc
      mysql-test/include/sync_slave_io_with_master.inc:
        Improved comments and error message.
      mysql-test/include/wait_for_slave_io_to_stop.inc:
        Refactored to use wait_for_slave_param.inc.
        Removed connection slave.
      mysql-test/include/wait_for_slave_param.inc:
        - Improved usage instructions
        - Added more debug info in case of timeout
        - Added parameters $slave_param_comparison, $slave_timeout,
        $slave_keep_connection, $slave_error_message
      mysql-test/include/wait_for_slave_sql_error.inc:
        Refactored to use wait_for_slave_param.inc.
        Removed connection slave.
      mysql-test/include/wait_for_slave_sql_to_start.inc:
        Refactored to use wait_for_slave_param.inc.
        Removed connection slave.
      mysql-test/include/wait_for_slave_sql_to_stop.inc:
        Refactored to use wait_for_slave_param.inc.
        Removed connection slave.
      mysql-test/include/wait_for_slave_to_start.inc:
        Refactored to use wait_for_slave_param.inc.
        Removed connection slave.
      mysql-test/include/wait_for_slave_to_stop.inc:
        Refactored to use wait_for_slave_param.inc.
        Removed connection slave.
      mysql-test/include/wait_show_pattern.inc:
        Removed unused (and error-prone) file
      mysql-test/include/wait_slave_status.inc:
        Removed unused (and error-prone) file
      mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test:
        Renamed $keep_connection to $slave_keep_connection.
      mysql-test/suite/rpl/t/rpl_bug26395.test:
        Replace stop slave by stop_slave.inc
      mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test:
        Replace start/stop slave by start_slave.inc/stop_slave.inc.
        Replace wait_for_slave_param by wait_for_slave_sql_to_stop.inc.
      mysql-test/suite/rpl/t/rpl_dual_pos_advance.test:
        Renamed $keep_connection to $slave_keep_connection.
      mysql-test/suite/rpl/t/rpl_flushlog_loop.test:
        Replace wait_slave_status by start_slave.inc
      mysql-test/suite/rpl/t/rpl_idempotency.test:
        Added connection slave since wait_for_slave_sql_to_stop.inc does not
        do that any more.
      mysql-test/suite/rpl/t/rpl_incident.test:
        Replaced wait_for_slave_to_stop by wait_for_slave_sql_to_stop.inc
      mysql-test/suite/rpl/t/rpl_init_slave.test:
        Replaced start/stop slave by start_slave.inc/stop_slave.inc.
        Replaced save_master_pos;connection slave;sync_with_master by
        sync_slave_with_master.
      mysql-test/suite/rpl/t/rpl_log_pos.test:
        Replaced start/stop slave by start_slave.inc/stop_slave.inc.
        Replaced wait_for_slave_param by other wait_for_slave_* macros.
      mysql-test/suite/rpl/t/rpl_packet.test:
        Replaced start/stop slave by start_slave.inc/stop_slave.inc.
      mysql-test/suite/rpl/t/rpl_row_inexist_tbl.test:
        Replaced start/stop slave by start_slave.inc/stop_slave.inc.
      mysql-test/suite/rpl/t/rpl_row_stop_middle_update.test:
        Replaced start/stop slave by start_slave.inc/stop_slave.inc.
      mysql-test/suite/rpl/t/rpl_row_until.test:
        Replaced start/stop slave by start_slave.inc/stop_slave.inc.
        Replaced save_master_pos;connection slave;sync_with_master by
        sync_slave_with_master.
      mysql-test/suite/rpl/t/rpl_server_id1.test:
        Replaced start/stop slave by start_slave.inc/stop_slave.inc.
      mysql-test/suite/rpl/t/rpl_slave_grp_exec.test:
        Replaced start/stop slave by start_slave.inc/stop_slave.inc.
      mysql-test/suite/rpl/t/rpl_slave_skip.test:
        Replaced start/stop slave by start_slave.inc/stop_slave.inc.
      mysql-test/suite/rpl/t/rpl_slave_status.test:
        Replaced start/stop slave by start_slave.inc/stop_slave.inc.
      mysql-test/suite/rpl/t/rpl_sp.test:
        Restore @@global.log_bin_trust_function_creators at end of test.
      mysql-test/suite/rpl/t/rpl_sp_effects.test:
        Restore @@global.log_bin_trust_function_creators at end of test.
      mysql-test/suite/rpl/t/rpl_stm_until.test:
        Replaced start/stop slave by start_slave.inc/stop_slave.inc.
        Replaced save_master_pos;connection slave;sync_with_master by
        sync_slave_with_master.
      mysql-test/suite/rpl_ndb/t/rpl_ndb_basic.test:
        Replaced start slave by start_slave.inc.
        Added explicit connection slave since wait_for_slave_sql_to_stop.inc
        does not do that anymore.
      mysql-test/t/disabled.def:
        Disabled failing test.
      mysql-test/t/func_time.test:
        Restore @@global.log_bin_trust_function_creators at end of test.
      mysql-test/t/grant.test:
        Restore @@global.log_bin_trust_function_creators at end of test.
      mysql-test/t/grant2.test:
        Restore @@global.log_bin_trust_function_creators at end of test.
      mysql-test/t/innodb_notembedded.test:
        Restore @@global.log_bin_trust_function_creators at end of test.
      mysql-test/t/log_bin_trust_function_creators_func.test:
        Restore @@global.log_bin_trust_function_creators at end of test.
        Clean up at end of test by dropping the created user.
      mysql-test/t/query_cache.test:
        Restore @@global.log_bin_trust_function_creators at end of test.
      mysql-test/t/query_cache_notembedded.test:
        Restore @@global.log_bin_trust_function_creators at end of test.
      mysql-test/t/rpl_init_slave_func.test:
        Replaced start/stop slave by start_slave.inc/stop_slave.inc.
      mysql-test/t/timezone2.test:
        Restore @@global.log_bin_trust_function_creators at end of test.
      6e695369
  11. 29 Jan, 2008 1 commit
    • unknown's avatar
      Test changes to fix failures in pushbuild. · b0f52885
      unknown authored
      mysql-test/include/show_binlog_events.inc:
        Replacing file_id=N with file_id=# to avoid result mismatches
      mysql-test/suite/binlog/r/binlog_killed_simulate.result:
        Result change
      mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result:
        Result change
      mysql-test/suite/binlog/r/binlog_stm_blackhole.result:
        Result change
      mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
        Result change
      mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test:
        Binlog positions differ between mixed and statement based replication.
      mysql-test/suite/rpl/r/rpl_stm_log.result:
        Result change
      b0f52885
  12. 20 Dec, 2007 1 commit
  13. 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
  14. 27 Jun, 2007 1 commit
    • unknown's avatar
      WL#3933 Split main test suite to rpl, rpl_ndb and ndb · a40e44ef
      unknown authored
       - Update mysql-test-run.pl to collect tests from several suites
       - Group test into suites
       - Add suite.opt file
      
      
      mysql-test/suite/ndb/r/ndb_multi.result:
        Rename: mysql-test/r/ndb_multi.result -> mysql-test/suite/ndb/r/ndb_multi.result
      mysql-test/suite/rpl/t/rpl_replicate_ignore_db.test:
        Rename: mysql-test/t/rpl_replicate_ignore_db.test -> mysql-test/suite/rpl/t/rpl_replicate_ignore_db.test
      mysql-test/suite/rpl/t/rpl_row_trig001.test:
        Rename: mysql-test/t/rpl_row_trig001.test -> mysql-test/suite/rpl/t/rpl_row_trig001.test
      mysql-test/suite/rpl_ndb/r/rpl_ndb_sp003.result:
        Rename: mysql-test/r/rpl_ndb_sp003.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_sp003.result
      mysql-test/suite/binlog/r/binlog_stm_insert_select.result:
        Rename: mysql-test/r/binlog_stm_insert_select.result -> mysql-test/suite/binlog/r/binlog_stm_insert_select.result
      mysql-test/suite/ndb/t/ndb_condition_pushdown.test:
        Rename: mysql-test/t/ndb_condition_pushdown.test -> mysql-test/suite/ndb/t/ndb_condition_pushdown.test
      mysql-test/suite/ndb/t/ndb_dd_dump.test:
        Rename: mysql-test/t/ndb_dd_dump.test -> mysql-test/suite/ndb/t/ndb_dd_dump.test
      mysql-test/suite/ndb/t/ndb_partition_range.test:
        Rename: mysql-test/t/ndb_partition_range.test -> mysql-test/suite/ndb/t/ndb_partition_range.test
      mysql-test/suite/ndb/t/strict_autoinc_5ndb.test:
        Rename: mysql-test/t/strict_autoinc_5ndb.test -> mysql-test/suite/ndb/t/strict_autoinc_5ndb.test
      mysql-test/suite/rpl/r/rpl_commit_after_flush.result:
        Rename: mysql-test/r/rpl_commit_after_flush.result -> mysql-test/suite/rpl/r/rpl_commit_after_flush.result
      mysql-test/suite/rpl/r/rpl_view.result:
        Rename: mysql-test/r/rpl_view.result -> mysql-test/suite/rpl/r/rpl_view.result
      mysql-test/suite/rpl/t/rpl_insert_select.test:
        Rename: mysql-test/t/rpl_insert_select.test -> mysql-test/suite/rpl/t/rpl_insert_select.test
      mysql-test/suite/rpl/t/rpl_load_from_master-slave.opt:
        Rename: mysql-test/t/rpl_load_from_master-slave.opt -> mysql-test/suite/rpl/t/rpl_load_from_master-slave.opt
      mysql-test/suite/rpl/t/rpl_many_optimize.test:
        Rename: mysql-test/t/rpl_many_optimize.test -> mysql-test/suite/rpl/t/rpl_many_optimize.test
      mysql-test/suite/rpl/t/rpl_mixed_ddl_dml.test:
        Rename: mysql-test/t/rpl_mixed_ddl_dml.test -> mysql-test/suite/rpl/t/rpl_mixed_ddl_dml.test
      mysql-test/suite/rpl/t/rpl_multi_delete.test:
        Rename: mysql-test/t/rpl_multi_delete.test -> mysql-test/suite/rpl/t/rpl_multi_delete.test
      mysql-test/suite/rpl/t/rpl_row_log_innodb.test:
        Rename: mysql-test/t/rpl_row_log_innodb.test -> mysql-test/suite/rpl/t/rpl_row_log_innodb.test
      mysql-test/suite/rpl/t/rpl_row_reset_slave.test:
        Rename: mysql-test/t/rpl_row_reset_slave.test -> mysql-test/suite/rpl/t/rpl_row_reset_slave.test
      mysql-test/suite/rpl/t/rpl_row_stop_middle.test:
        Rename: mysql-test/t/rpl_row_stop_middle.test -> mysql-test/suite/rpl/t/rpl_row_stop_middle.test
      mysql-test/suite/rpl/t/rpl_stm_log-master.opt:
        Rename: mysql-test/t/rpl_stm_log-master.opt -> mysql-test/suite/rpl/t/rpl_stm_log-master.opt
      mysql-test/suite/rpl_ndb/r/rpl_ndb_delete_nowhere.result:
        Rename: mysql-test/r/rpl_ndb_delete_nowhere.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_delete_nowhere.result
      mysql-test/suite/rpl_ndb/t/rpl_ndb_sync.test:
        Rename: mysql-test/t/rpl_ndb_sync.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_sync.test
      mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result:
        Rename: mysql-test/r/binlog_row_mix_innodb_myisam.result -> mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
      mysql-test/suite/ndb/r/ndb_dd_alter.result:
        Rename: mysql-test/r/ndb_dd_alter.result -> mysql-test/suite/ndb/r/ndb_dd_alter.result
      mysql-test/suite/ndb/r/ndb_index_unique.result:
        Rename: mysql-test/r/ndb_index_unique.result -> mysql-test/suite/ndb/r/ndb_index_unique.result
      mysql-test/suite/ndb/r/ndb_rename.result:
        Rename: mysql-test/r/ndb_rename.result -> mysql-test/suite/ndb/r/ndb_rename.result
      mysql-test/suite/ndb/r/ndb_update.result:
        Rename: mysql-test/r/ndb_update.result -> mysql-test/suite/ndb/r/ndb_update.result
      mysql-test/suite/ndb/r/ndb_view.result:
        Rename: mysql-test/r/ndb_view.result -> mysql-test/suite/ndb/r/ndb_view.result
      mysql-test/suite/ndb/t/ndb_alter_table2.test:
        Rename: mysql-test/t/ndb_alter_table2.test -> mysql-test/suite/ndb/t/ndb_alter_table2.test
      mysql-test/suite/ndb/t/ndb_autodiscover.test:
        Rename: mysql-test/t/ndb_autodiscover.test -> mysql-test/suite/ndb/t/ndb_autodiscover.test
      mysql-test/suite/ndb/t/ndb_binlog_discover.test:
        Rename: mysql-test/t/ndb_binlog_discover.test -> mysql-test/suite/ndb/t/ndb_binlog_discover.test
      mysql-test/suite/ndb/t/ndb_binlog_multi.test:
        Rename: mysql-test/t/ndb_binlog_multi.test -> mysql-test/suite/ndb/t/ndb_binlog_multi.test
      mysql-test/suite/ndb/t/ndb_cache_multi.test:
        Rename: mysql-test/t/ndb_cache_multi.test -> mysql-test/suite/ndb/t/ndb_cache_multi.test
      mysql-test/suite/ndb/t/ndb_partition_error2-master.opt:
        Rename: mysql-test/t/ndb_partition_error2-master.opt -> mysql-test/suite/ndb/t/ndb_partition_error2-master.opt
      mysql-test/suite/rpl/r/rpl000001.a.result:
        Rename: mysql-test/r/rpl000001.a.result -> mysql-test/suite/rpl/r/rpl000001.a.result
      mysql-test/suite/rpl/r/rpl_alter.result:
        Rename: mysql-test/r/rpl_alter.result -> mysql-test/suite/rpl/r/rpl_alter.result
      mysql-test/suite/rpl/r/rpl_insert_ignore.result:
        Rename: mysql-test/r/rpl_insert_ignore.result -> mysql-test/suite/rpl/r/rpl_insert_ignore.result
      mysql-test/suite/rpl/r/rpl_relayspace.result:
        Rename: mysql-test/r/rpl_relayspace.result -> mysql-test/suite/rpl/r/rpl_relayspace.result
      mysql-test/suite/rpl/r/rpl_row_func001.result:
        Rename: mysql-test/r/rpl_row_func001.result -> mysql-test/suite/rpl/r/rpl_row_func001.result
      mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result:
        Rename: mysql-test/r/rpl_row_inexist_tbl.result -> mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result
      mysql-test/suite/rpl/r/rpl_stm_insert_delayed.result:
        Rename: mysql-test/r/rpl_stm_insert_delayed.result -> mysql-test/suite/rpl/r/rpl_stm_insert_delayed.result
      mysql-test/suite/rpl/t/rpl_create_database.test:
        Rename: mysql-test/t/rpl_create_database.test -> mysql-test/suite/rpl/t/rpl_create_database.test
      mysql-test/suite/rpl/t/rpl_dual_pos_advance-master.opt:
        Rename: mysql-test/t/rpl_dual_pos_advance-master.opt -> mysql-test/suite/rpl/t/rpl_dual_pos_advance-master.opt
      mysql-test/suite/rpl/t/rpl_flushlog_loop-slave.sh:
        Rename: mysql-test/t/rpl_flushlog_loop-slave.sh -> mysql-test/suite/rpl/t/rpl_flushlog_loop-slave.sh
      mysql-test/suite/rpl/t/rpl_ignore_grant.test:
        Rename: mysql-test/t/rpl_ignore_grant.test -> mysql-test/suite/rpl/t/rpl_ignore_grant.test
      mysql-test/suite/rpl/t/rpl_multi_update2-slave.opt:
        Rename: mysql-test/t/rpl_multi_update2-slave.opt -> mysql-test/suite/rpl/t/rpl_multi_update2-slave.opt
      mysql-test/suite/rpl/t/rpl_multi_update4.test:
        Rename: mysql-test/t/rpl_multi_update4.test -> mysql-test/suite/rpl/t/rpl_multi_update4.test
      mysql-test/suite/rpl/t/rpl_rewrt_db.test:
        Rename: mysql-test/t/rpl_rewrt_db.test -> mysql-test/suite/rpl/t/rpl_rewrt_db.test
      mysql-test/suite/rpl/t/rpl_rotate_logs-master.opt:
        Rename: mysql-test/t/rpl_rotate_logs-master.opt -> mysql-test/suite/rpl/t/rpl_rotate_logs-master.opt
      mysql-test/suite/rpl/t/rpl_row_4_bytes.test:
        Rename: mysql-test/t/rpl_row_4_bytes.test -> mysql-test/suite/rpl/t/rpl_row_4_bytes.test
      mysql-test/suite/rpl/t/rpl_row_create_table-slave.opt:
        Rename: mysql-test/t/rpl_row_create_table-slave.opt -> mysql-test/suite/rpl/t/rpl_row_create_table-slave.opt
      mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test:
        Rename: mysql-test/t/rpl_row_flsh_tbls.test -> mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test
      mysql-test/suite/rpl/t/rpl_row_func003.test:
        Rename: mysql-test/t/rpl_row_func003.test -> mysql-test/suite/rpl/t/rpl_row_func003.test
      mysql-test/suite/rpl/t/rpl_row_sp007_innodb.test:
        Rename: mysql-test/t/rpl_row_sp007_innodb.test -> mysql-test/suite/rpl/t/rpl_row_sp007_innodb.test
      mysql-test/suite/rpl/t/rpl_row_stop_middle_update-slave.opt:
        Rename: mysql-test/t/rpl_row_stop_middle_update-slave.opt -> mysql-test/suite/rpl/t/rpl_row_stop_middle_update-slave.opt
      mysql-test/suite/rpl/t/rpl_row_tabledefs_3innodb.test:
        Rename: mysql-test/t/rpl_row_tabledefs_3innodb.test -> mysql-test/suite/rpl/t/rpl_row_tabledefs_3innodb.test
      mysql-test/suite/rpl/t/rpl_ssl1.test:
        Rename: mysql-test/t/rpl_ssl1.test -> mysql-test/suite/rpl/t/rpl_ssl1.test
      mysql-test/suite/rpl/t/rpl_stm_max_relay_size.test:
        Rename: mysql-test/t/rpl_stm_max_relay_size.test -> mysql-test/suite/rpl/t/rpl_stm_max_relay_size.test
      mysql-test/suite/rpl/t/rpl_stm_mystery22.test:
        Rename: mysql-test/t/rpl_stm_mystery22.test -> mysql-test/suite/rpl/t/rpl_stm_mystery22.test
      mysql-test/suite/rpl/t/rpl_truncate_7ndb_2.test:
        Rename: mysql-test/t/rpl_truncate_7ndb_2.test -> mysql-test/suite/rpl/t/rpl_truncate_7ndb_2.test
      mysql-test/suite/rpl/t/rpl_variables.test:
        Rename: mysql-test/t/rpl_variables.test -> mysql-test/suite/rpl/t/rpl_variables.test
      mysql-test/suite/rpl_ndb/r/rpl_ndb_auto_inc.result:
        Rename: mysql-test/r/rpl_ndb_auto_inc.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_auto_inc.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_do_db.result:
        Rename: mysql-test/r/rpl_ndb_do_db.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_do_db.result
      mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb.result:
        Rename: mysql-test/r/rpl_truncate_7ndb.result -> mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb.result
      mysql-test/suite/rpl_ndb/t/rpl_ndb_do_table.test:
        Rename: mysql-test/t/rpl_ndb_do_table.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_do_table.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_multi.test:
        Rename: mysql-test/t/rpl_ndb_multi.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_multi.test
      mysql-test/suite/binlog/r/binlog_row_blackhole.result:
        Rename: mysql-test/r/binlog_row_blackhole.result -> mysql-test/suite/binlog/r/binlog_row_blackhole.result
      mysql-test/suite/binlog/r/binlog_row_ctype_cp932.result:
        Rename: mysql-test/r/binlog_row_ctype_cp932.result -> mysql-test/suite/binlog/r/binlog_row_ctype_cp932.result
      mysql-test/suite/binlog/r/binlog_row_insert_select.result:
        Rename: mysql-test/r/binlog_row_insert_select.result -> mysql-test/suite/binlog/r/binlog_row_insert_select.result
      mysql-test/suite/binlog/r/binlog_stm_ps.result:
        Rename: mysql-test/r/binlog_stm_ps.result -> mysql-test/suite/binlog/r/binlog_stm_ps.result
      mysql-test/suite/binlog/t/binlog_row_binlog-master.opt:
        Rename: mysql-test/t/binlog_row_binlog-master.opt -> mysql-test/suite/binlog/t/binlog_row_binlog-master.opt
      mysql-test/suite/binlog/t/binlog_row_innodb_stat-master.opt:
        Rename: mysql-test/t/binlog_row_innodb_stat-master.opt -> mysql-test/suite/binlog/t/binlog_row_innodb_stat-master.opt
      mysql-test/suite/binlog/t/binlog_row_innodb_stat.test:
        Rename: mysql-test/t/binlog_row_innodb_stat.test -> mysql-test/suite/binlog/t/binlog_row_innodb_stat.test
      mysql-test/suite/binlog/t/binlog_stm_ctype_ucs.test:
        Rename: mysql-test/t/binlog_stm_ctype_ucs.test -> mysql-test/suite/binlog/t/binlog_stm_ctype_ucs.test
      mysql-test/suite/ndb/r/ndb_binlog_ddl_multi.result:
        Rename: mysql-test/r/ndb_binlog_ddl_multi.result -> mysql-test/suite/ndb/r/ndb_binlog_ddl_multi.result
      mysql-test/suite/ndb/r/ndb_dd_backuprestore.result:
        Rename: mysql-test/r/ndb_dd_backuprestore.result -> mysql-test/suite/ndb/r/ndb_dd_backuprestore.result
      mysql-test/suite/ndb/r/ndb_index_ordered.result:
        Rename: mysql-test/r/ndb_index_ordered.result -> mysql-test/suite/ndb/r/ndb_index_ordered.result
      mysql-test/suite/ndb/r/ndb_lock.result:
        Rename: mysql-test/r/ndb_lock.result -> mysql-test/suite/ndb/r/ndb_lock.result
      mysql-test/suite/ndb/r/ndb_partition_range.result:
        Rename: mysql-test/r/ndb_partition_range.result -> mysql-test/suite/ndb/r/ndb_partition_range.result
      mysql-test/suite/ndb/r/ndb_replace.result:
        Rename: mysql-test/r/ndb_replace.result -> mysql-test/suite/ndb/r/ndb_replace.result
      mysql-test/suite/ndb/t/ndb_alter_table3.test:
        Rename: mysql-test/t/ndb_alter_table3.test -> mysql-test/suite/ndb/t/ndb_alter_table3.test
      mysql-test/suite/ndb/t/ndb_binlog_basic.test:
        Rename: mysql-test/t/ndb_binlog_basic.test -> mysql-test/suite/ndb/t/ndb_binlog_basic.test
      mysql-test/suite/ndb/t/ndb_bitfield.test:
        Rename: mysql-test/t/ndb_bitfield.test -> mysql-test/suite/ndb/t/ndb_bitfield.test
      mysql-test/suite/ndb/t/ndb_blob_partition.test:
        Rename: mysql-test/t/ndb_blob_partition.test -> mysql-test/suite/ndb/t/ndb_blob_partition.test
      mysql-test/suite/ndb/t/ndb_cache.test:
        Rename: mysql-test/t/ndb_cache.test -> mysql-test/suite/ndb/t/ndb_cache.test
      mysql-test/suite/ndb/t/ndb_cache2.test:
        Rename: mysql-test/t/ndb_cache2.test -> mysql-test/suite/ndb/t/ndb_cache2.test
      mysql-test/suite/ndb/t/ndb_dd_alter.test:
        Rename: mysql-test/t/ndb_dd_alter.test -> mysql-test/suite/ndb/t/ndb_dd_alter.test
      mysql-test/suite/ndb/t/ndb_dd_backuprestore.test:
        Rename: mysql-test/t/ndb_dd_backuprestore.test -> mysql-test/suite/ndb/t/ndb_dd_backuprestore.test
      mysql-test/suite/ndb/t/ndb_limit.test:
        Rename: mysql-test/t/ndb_limit.test -> mysql-test/suite/ndb/t/ndb_limit.test
      mysql-test/suite/ndb/t/ndb_minmax.test:
        Rename: mysql-test/t/ndb_minmax.test -> mysql-test/suite/ndb/t/ndb_minmax.test
      mysql-test/suite/ndb/t/ndb_partition_list.test:
        Rename: mysql-test/t/ndb_partition_list.test -> mysql-test/suite/ndb/t/ndb_partition_list.test
      mysql-test/suite/ndb/t/ndb_restore_partition.test:
        Rename: mysql-test/t/ndb_restore_partition.test -> mysql-test/suite/ndb/t/ndb_restore_partition.test
      mysql-test/suite/ndb/t/ndb_restore_print.test:
        Rename: mysql-test/t/ndb_restore_print.test -> mysql-test/suite/ndb/t/ndb_restore_print.test
      mysql-test/suite/rpl/r/rpl000001.b.result:
        Rename: mysql-test/r/rpl000001.b.result -> mysql-test/suite/rpl/r/rpl000001.b.result
      mysql-test/suite/rpl/r/rpl000017.result:
        Rename: mysql-test/r/rpl000017.result -> mysql-test/suite/rpl/r/rpl000017.result
      mysql-test/suite/rpl/r/rpl_bit.result:
        Rename: mysql-test/r/rpl_bit.result -> mysql-test/suite/rpl/r/rpl_bit.result
      mysql-test/suite/rpl/r/rpl_dual_pos_advance.result:
        Rename: mysql-test/r/rpl_dual_pos_advance.result -> mysql-test/suite/rpl/r/rpl_dual_pos_advance.result
      mysql-test/suite/rpl/r/rpl_failed_optimize.result:
        Rename: mysql-test/r/rpl_failed_optimize.result -> mysql-test/suite/rpl/r/rpl_failed_optimize.result
      mysql-test/suite/rpl/r/rpl_ignore_table_update.result:
        Rename: mysql-test/r/rpl_ignore_table_update.result -> mysql-test/suite/rpl/r/rpl_ignore_table_update.result
      mysql-test/suite/rpl/r/rpl_insert_id_pk.result:
        Rename: mysql-test/r/rpl_insert_id_pk.result -> mysql-test/suite/rpl/r/rpl_insert_id_pk.result
      mysql-test/suite/rpl/r/rpl_known_bugs_detection.result:
        Rename: mysql-test/r/rpl_known_bugs_detection.result -> mysql-test/suite/rpl/r/rpl_known_bugs_detection.result
      mysql-test/suite/rpl/r/rpl_loaddata.result:
        Rename: mysql-test/r/rpl_loaddata.result -> mysql-test/suite/rpl/r/rpl_loaddata.result
      mysql-test/suite/rpl/r/rpl_redirect.result:
        Rename: mysql-test/r/rpl_redirect.result -> mysql-test/suite/rpl/r/rpl_redirect.result
      mysql-test/suite/rpl/r/rpl_row_NOW.result:
        Rename: mysql-test/r/rpl_row_NOW.result -> mysql-test/suite/rpl/r/rpl_row_NOW.result
      mysql-test/suite/rpl/r/rpl_row_func002.result:
        Rename: mysql-test/r/rpl_row_func002.result -> mysql-test/suite/rpl/r/rpl_row_func002.result
      mysql-test/suite/rpl/r/rpl_row_loaddata_m.result:
        Rename: mysql-test/r/rpl_row_loaddata_m.result -> mysql-test/suite/rpl/r/rpl_row_loaddata_m.result
      mysql-test/suite/rpl/r/rpl_row_stop_middle_update.result:
        Rename: mysql-test/r/rpl_row_stop_middle_update.result -> mysql-test/suite/rpl/r/rpl_row_stop_middle_update.result
      mysql-test/suite/rpl/r/rpl_row_trig001.result:
        Rename: mysql-test/r/rpl_row_trig001.result -> mysql-test/suite/rpl/r/rpl_row_trig001.result
      mysql-test/suite/rpl/r/rpl_stm_no_op.result:
        Rename: mysql-test/r/rpl_stm_no_op.result -> mysql-test/suite/rpl/r/rpl_stm_no_op.result
      mysql-test/suite/rpl/r/rpl_truncate_3innodb.result:
        Rename: mysql-test/r/rpl_truncate_3innodb.result -> mysql-test/suite/rpl/r/rpl_truncate_3innodb.result
      mysql-test/suite/rpl/t/rpl000011.test:
        Rename: mysql-test/t/rpl000011.test -> mysql-test/suite/rpl/t/rpl000011.test
      mysql-test/suite/rpl/t/rpl_alter_db.test:
        Rename: mysql-test/t/rpl_alter_db.test -> mysql-test/suite/rpl/t/rpl_alter_db.test
      mysql-test/suite/rpl/t/rpl_delete_no_where.test:
        Rename: mysql-test/t/rpl_delete_no_where.test -> mysql-test/suite/rpl/t/rpl_delete_no_where.test
      mysql-test/suite/rpl/t/rpl_dual_pos_advance.test:
        Rename: mysql-test/t/rpl_dual_pos_advance.test -> mysql-test/suite/rpl/t/rpl_dual_pos_advance.test
      mysql-test/suite/rpl/t/rpl_flushlog_loop-master.opt:
        Rename: mysql-test/t/rpl_flushlog_loop-master.opt -> mysql-test/suite/rpl/t/rpl_flushlog_loop-master.opt
      mysql-test/suite/rpl/t/rpl_flushlog_loop-master.sh:
        Rename: mysql-test/t/rpl_flushlog_loop-master.sh -> mysql-test/suite/rpl/t/rpl_flushlog_loop-master.sh
      mysql-test/suite/rpl/t/rpl_get_lock.test:
        Rename: mysql-test/t/rpl_get_lock.test -> mysql-test/suite/rpl/t/rpl_get_lock.test
      mysql-test/suite/rpl/t/rpl_ignore_grant-slave.opt:
        Rename: mysql-test/t/rpl_ignore_grant-slave.opt -> mysql-test/suite/rpl/t/rpl_ignore_grant-slave.opt
      mysql-test/suite/rpl/t/rpl_incident.test:
        Rename: mysql-test/t/rpl_incident.test -> mysql-test/suite/rpl/t/rpl_incident.test
      mysql-test/suite/rpl/t/rpl_insert_ignore-slave.opt:
        Rename: mysql-test/t/rpl_insert_ignore-slave.opt -> mysql-test/suite/rpl/t/rpl_insert_ignore-slave.opt
      mysql-test/suite/rpl/t/rpl_known_bugs_detection-master.opt:
        Rename: mysql-test/t/rpl_known_bugs_detection-master.opt -> mysql-test/suite/rpl/t/rpl_known_bugs_detection-master.opt
      mysql-test/suite/rpl/t/rpl_loaddata_m.test:
        Rename: mysql-test/t/rpl_loaddata_m.test -> mysql-test/suite/rpl/t/rpl_loaddata_m.test
      mysql-test/suite/rpl/t/rpl_loaddata_s-slave.opt:
        Rename: mysql-test/t/rpl_loaddata_s-slave.opt -> mysql-test/suite/rpl/t/rpl_loaddata_s-slave.opt
      mysql-test/suite/rpl/t/rpl_loadfile.test:
        Rename: mysql-test/t/rpl_loadfile.test -> mysql-test/suite/rpl/t/rpl_loadfile.test
      mysql-test/suite/rpl/t/rpl_read_only.test:
        Rename: mysql-test/t/rpl_read_only.test -> mysql-test/suite/rpl/t/rpl_read_only.test
      mysql-test/suite/rpl/t/rpl_redirect.test:
        Rename: mysql-test/t/rpl_redirect.test -> mysql-test/suite/rpl/t/rpl_redirect.test
      mysql-test/suite/rpl/t/rpl_relay_space_innodb.test:
        Rename: mysql-test/t/rpl_relay_space_innodb.test -> mysql-test/suite/rpl/t/rpl_relay_space_innodb.test
      mysql-test/suite/rpl/t/rpl_row_basic_11bugs-master.opt:
        Rename: mysql-test/t/rpl_row_basic_11bugs-master.opt -> mysql-test/suite/rpl/t/rpl_row_basic_11bugs-master.opt
      mysql-test/suite/rpl/t/rpl_row_err_daisychain-slave.opt:
        Rename: mysql-test/t/rpl_row_err_daisychain-slave.opt -> mysql-test/suite/rpl/t/rpl_row_err_daisychain-slave.opt
      mysql-test/suite/rpl/t/rpl_row_log-slave.opt:
        Rename: mysql-test/t/rpl_row_log-slave.opt -> mysql-test/suite/rpl/t/rpl_row_log-slave.opt
      mysql-test/suite/rpl/t/rpl_row_mysqlbinlog-master.opt:
        Rename: mysql-test/t/rpl_row_mysqlbinlog-master.opt -> mysql-test/suite/rpl/t/rpl_row_mysqlbinlog-master.opt
      mysql-test/suite/rpl/t/rpl_row_sp006_InnoDB.test:
        Rename: mysql-test/t/rpl_row_sp006_InnoDB.test -> mysql-test/suite/rpl/t/rpl_row_sp006_InnoDB.test
      mysql-test/suite/rpl/t/rpl_row_sp007_innodb-slave.opt:
        Rename: mysql-test/t/rpl_row_sp007_innodb-slave.opt -> mysql-test/suite/rpl/t/rpl_row_sp007_innodb-slave.opt
      mysql-test/suite/rpl/t/rpl_row_stop_middle_update-master.opt:
        Rename: mysql-test/t/rpl_row_stop_middle_update-master.opt -> mysql-test/suite/rpl/t/rpl_row_stop_middle_update-master.opt
      mysql-test/suite/rpl/t/rpl_row_tabledefs_3innodb-slave.opt:
        Rename: mysql-test/t/rpl_row_tabledefs_3innodb-slave.opt -> mysql-test/suite/rpl/t/rpl_row_tabledefs_3innodb-slave.opt
      mysql-test/suite/rpl/t/rpl_sp_effects-slave.opt:
        Rename: mysql-test/t/rpl_sp_effects-slave.opt -> mysql-test/suite/rpl/t/rpl_sp_effects-slave.opt
      mysql-test/suite/rpl/t/rpl_sp_effects.test:
        Rename: mysql-test/t/rpl_sp_effects.test -> mysql-test/suite/rpl/t/rpl_sp_effects.test
      mysql-test/suite/rpl/t/rpl_sporadic_master-master.opt:
        Rename: mysql-test/t/rpl_sporadic_master-master.opt -> mysql-test/suite/rpl/t/rpl_sporadic_master-master.opt
      mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test:
        Rename: mysql-test/t/rpl_switch_stm_row_mixed.test -> mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test
      mysql-test/suite/rpl/t/rpl_temporary.test:
        Rename: mysql-test/t/rpl_temporary.test -> mysql-test/suite/rpl/t/rpl_temporary.test
      mysql-test/suite/rpl/t/rpl_timezone-master.opt:
        Rename: mysql-test/t/rpl_timezone-master.opt -> mysql-test/suite/rpl/t/rpl_timezone-master.opt
      mysql-test/suite/rpl/t/rpl_trigger.test:
        Rename: mysql-test/t/rpl_trigger.test -> mysql-test/suite/rpl/t/rpl_trigger.test
      mysql-test/suite/rpl/t/rpl_trunc_temp.test:
        Rename: mysql-test/t/rpl_trunc_temp.test -> mysql-test/suite/rpl/t/rpl_trunc_temp.test
      mysql-test/suite/rpl_ndb/r/rpl_ndb_bank.result:
        Rename: mysql-test/r/rpl_ndb_bank.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_bank.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_blob.result:
        Rename: mysql-test/r/rpl_ndb_blob.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_blob.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_blob2.result:
        Rename: mysql-test/r/rpl_ndb_blob2.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_blob2.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_relayrotate.result:
        Rename: mysql-test/r/rpl_ndb_relayrotate.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_relayrotate.result
      mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb.test:
        Rename: mysql-test/t/rpl_ndb_2innodb.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_charset.test:
        Rename: mysql-test/t/rpl_ndb_charset.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_charset.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_basic.test:
        Rename: mysql-test/t/rpl_ndb_dd_basic.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_basic.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_ddl.test:
        Rename: mysql-test/t/rpl_ndb_ddl.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_ddl.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_delete_nowhere.test:
        Rename: mysql-test/t/rpl_ndb_delete_nowhere.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_delete_nowhere.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_do_db-slave.opt:
        Rename: mysql-test/t/rpl_ndb_do_db-slave.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_do_db-slave.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb-master.opt:
        Rename: mysql-test/t/rpl_ndb_innodb2ndb-master.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb-master.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_log-master.opt:
        Rename: mysql-test/t/rpl_ndb_log-master.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_log-master.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_relayrotate-slave.opt:
        Rename: mysql-test/t/rpl_ndb_relayrotate-slave.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_relayrotate-slave.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_sp006.test:
        Rename: mysql-test/t/rpl_ndb_sp006.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_sp006.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_trig004.test:
        Rename: mysql-test/t/rpl_ndb_trig004.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_trig004.test
      mysql-test/suite/binlog/r/binlog_stm_ctype_cp932.result:
        Rename: mysql-test/r/binlog_stm_ctype_cp932.result -> mysql-test/suite/binlog/r/binlog_stm_ctype_cp932.result
      mysql-test/suite/ndb/r/ndb_basic.result:
        Rename: mysql-test/r/ndb_basic.result -> mysql-test/suite/ndb/r/ndb_basic.result
      mysql-test/suite/ndb/r/ndb_binlog_log_bin.result:
        Rename: mysql-test/r/ndb_binlog_log_bin.result -> mysql-test/suite/ndb/r/ndb_binlog_log_bin.result
      mysql-test/suite/ndb/r/ndb_cursor.result:
        Rename: mysql-test/r/ndb_cursor.result -> mysql-test/suite/ndb/r/ndb_cursor.result
      mysql-test/suite/ndb/r/ndb_dd_basic.result:
        Rename: mysql-test/r/ndb_dd_basic.result -> mysql-test/suite/ndb/r/ndb_dd_basic.result
      mysql-test/suite/ndb/r/ndb_dd_sql_features.result:
        Rename: mysql-test/r/ndb_dd_sql_features.result -> mysql-test/suite/ndb/r/ndb_dd_sql_features.result
      mysql-test/suite/ndb/r/ndb_gis.result:
        Rename: mysql-test/r/ndb_gis.result -> mysql-test/suite/ndb/r/ndb_gis.result
      mysql-test/suite/ndb/r/ndb_load.result:
        Rename: mysql-test/r/ndb_load.result -> mysql-test/suite/ndb/r/ndb_load.result
      mysql-test/suite/ndb/r/ndb_multi_row.result:
        Rename: mysql-test/r/ndb_multi_row.result -> mysql-test/suite/ndb/r/ndb_multi_row.result
      mysql-test/suite/ndb/r/ndb_trigger.result:
        Rename: mysql-test/r/ndb_trigger.result -> mysql-test/suite/ndb/r/ndb_trigger.result
      mysql-test/suite/ndb/r/ndb_types.result:
        Rename: mysql-test/r/ndb_types.result -> mysql-test/suite/ndb/r/ndb_types.result
      mysql-test/suite/ndb/t/ndb_alter_table.test:
        Rename: mysql-test/t/ndb_alter_table.test -> mysql-test/suite/ndb/t/ndb_alter_table.test
      mysql-test/suite/ndb/t/ndb_basic.test:
        Rename: mysql-test/t/ndb_basic.test -> mysql-test/suite/ndb/t/ndb_basic.test
      mysql-test/suite/ndb/t/ndb_binlog_ignore_db-master.opt:
        Rename: mysql-test/t/ndb_binlog_ignore_db-master.opt -> mysql-test/suite/ndb/t/ndb_binlog_ignore_db-master.opt
      mysql-test/suite/ndb/t/ndb_blob.test:
        Rename: mysql-test/t/ndb_blob.test -> mysql-test/suite/ndb/t/ndb_blob.test
      mysql-test/suite/ndb/t/ndb_dd_ddl.test:
        Rename: mysql-test/t/ndb_dd_ddl.test -> mysql-test/suite/ndb/t/ndb_dd_ddl.test
      mysql-test/suite/ndb/t/ndb_dd_disk2memory.test:
        Rename: mysql-test/t/ndb_dd_disk2memory.test -> mysql-test/suite/ndb/t/ndb_dd_disk2memory.test
      mysql-test/suite/ndb/t/ndb_index_unique.test:
        Rename: mysql-test/t/ndb_index_unique.test -> mysql-test/suite/ndb/t/ndb_index_unique.test
      mysql-test/suite/ndb/t/ndb_read_multi_range.test:
        Rename: mysql-test/t/ndb_read_multi_range.test -> mysql-test/suite/ndb/t/ndb_read_multi_range.test
      mysql-test/suite/ndb/t/ndb_row_format.test:
        Rename: mysql-test/t/ndb_row_format.test -> mysql-test/suite/ndb/t/ndb_row_format.test
      mysql-test/suite/rpl/r/rpl_alter_db.result:
        Rename: mysql-test/r/rpl_alter_db.result -> mysql-test/suite/rpl/r/rpl_alter_db.result
      mysql-test/suite/rpl/r/rpl_drop_db.result:
        Rename: mysql-test/r/rpl_drop_db.result -> mysql-test/suite/rpl/r/rpl_drop_db.result
      mysql-test/suite/rpl/r/rpl_log_pos.result:
        Rename: mysql-test/r/rpl_log_pos.result -> mysql-test/suite/rpl/r/rpl_log_pos.result
      mysql-test/suite/rpl/r/rpl_multi_update3.result:
        Rename: mysql-test/r/rpl_multi_update3.result -> mysql-test/suite/rpl/r/rpl_multi_update3.result
      mysql-test/suite/rpl/r/rpl_rewrt_db.result:
        Rename: mysql-test/r/rpl_rewrt_db.result -> mysql-test/suite/rpl/r/rpl_rewrt_db.result
      mysql-test/suite/rpl/r/rpl_row_create_table.result:
        Rename: mysql-test/r/rpl_row_create_table.result -> mysql-test/suite/rpl/r/rpl_row_create_table.result
      mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result:
        Rename: mysql-test/r/rpl_row_flsh_tbls.result -> mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result
      mysql-test/suite/rpl/r/rpl_row_func003.result:
        Rename: mysql-test/r/rpl_row_func003.result -> mysql-test/suite/rpl/r/rpl_row_func003.result
      mysql-test/suite/rpl/r/rpl_row_sp008.result:
        Rename: mysql-test/r/rpl_row_sp008.result -> mysql-test/suite/rpl/r/rpl_row_sp008.result
      mysql-test/suite/rpl/r/rpl_row_trig002.result:
        Rename: mysql-test/r/rpl_row_trig002.result -> mysql-test/suite/rpl/r/rpl_row_trig002.result
      mysql-test/suite/rpl/r/rpl_sp004.result:
        Rename: mysql-test/r/rpl_sp004.result -> mysql-test/suite/rpl/r/rpl_sp004.result
      mysql-test/suite/rpl/r/rpl_ssl.result:
        Rename: mysql-test/r/rpl_ssl.result -> mysql-test/suite/rpl/r/rpl_ssl.result
      mysql-test/suite/rpl/r/rpl_stm_EE_err2.result:
        Rename: mysql-test/r/rpl_stm_EE_err2.result -> mysql-test/suite/rpl/r/rpl_stm_EE_err2.result
      mysql-test/suite/rpl/r/rpl_stm_multi_query.result:
        Rename: mysql-test/r/rpl_stm_multi_query.result -> mysql-test/suite/rpl/r/rpl_stm_multi_query.result
      mysql-test/suite/rpl/t/rpl000013.test:
        Rename: mysql-test/t/rpl000013.test -> mysql-test/suite/rpl/t/rpl000013.test
      mysql-test/suite/rpl/t/rpl000017-slave.opt:
        Rename: mysql-test/t/rpl000017-slave.opt -> mysql-test/suite/rpl/t/rpl000017-slave.opt
      mysql-test/suite/rpl/t/rpl_drop_db.test:
        Rename: mysql-test/t/rpl_drop_db.test -> mysql-test/suite/rpl/t/rpl_drop_db.test
      mysql-test/suite/rpl/t/rpl_flushlog_loop.test:
        Rename: mysql-test/t/rpl_flushlog_loop.test -> mysql-test/suite/rpl/t/rpl_flushlog_loop.test
      mysql-test/suite/rpl/t/rpl_load_from_master.test:
        Rename: mysql-test/t/rpl_load_from_master.test -> mysql-test/suite/rpl/t/rpl_load_from_master.test
      mysql-test/suite/rpl/t/rpl_locale.test:
        Rename: mysql-test/t/rpl_locale.test -> mysql-test/suite/rpl/t/rpl_locale.test
      mysql-test/suite/rpl/t/rpl_multi_delete-slave.opt:
        Rename: mysql-test/t/rpl_multi_delete-slave.opt -> mysql-test/suite/rpl/t/rpl_multi_delete-slave.opt
      mysql-test/suite/rpl/t/rpl_rotate_logs.test:
        Rename: mysql-test/t/rpl_rotate_logs.test -> mysql-test/suite/rpl/t/rpl_rotate_logs.test
      mysql-test/suite/rpl/t/rpl_row_NOW.test:
        Rename: mysql-test/t/rpl_row_NOW.test -> mysql-test/suite/rpl/t/rpl_row_NOW.test
      mysql-test/suite/rpl/t/rpl_row_err_daisychain-master.opt:
        Rename: mysql-test/t/rpl_row_err_daisychain-master.opt -> mysql-test/suite/rpl/t/rpl_row_err_daisychain-master.opt
      mysql-test/suite/rpl/t/rpl_row_inexist_tbl.test:
        Rename: mysql-test/t/rpl_row_inexist_tbl.test -> mysql-test/suite/rpl/t/rpl_row_inexist_tbl.test
      mysql-test/suite/rpl/t/rpl_row_mystery22.test:
        Rename: mysql-test/t/rpl_row_mystery22.test -> mysql-test/suite/rpl/t/rpl_row_mystery22.test
      mysql-test/suite/rpl/t/rpl_row_sp003.test:
        Rename: mysql-test/t/rpl_row_sp003.test -> mysql-test/suite/rpl/t/rpl_row_sp003.test
      mysql-test/suite/rpl/t/rpl_row_sp011.test:
        Rename: mysql-test/t/rpl_row_sp011.test -> mysql-test/suite/rpl/t/rpl_row_sp011.test
      mysql-test/suite/rpl/t/rpl_server_id1.test:
        Rename: mysql-test/t/rpl_server_id1.test -> mysql-test/suite/rpl/t/rpl_server_id1.test
      mysql-test/suite/rpl/t/rpl_session_var.test:
        Rename: mysql-test/t/rpl_session_var.test -> mysql-test/suite/rpl/t/rpl_session_var.test
      mysql-test/suite/rpl/t/rpl_skip_error.test:
        Rename: mysql-test/t/rpl_skip_error.test -> mysql-test/suite/rpl/t/rpl_skip_error.test
      mysql-test/suite/rpl_ndb/r/rpl_ndb_commit_afterflush.result:
        Rename: mysql-test/r/rpl_ndb_commit_afterflush.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_commit_afterflush.result
      mysql-test/suite/rpl_ndb/t/rpl_ndb_do_db.test:
        Rename: mysql-test/t/rpl_ndb_do_db.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_do_db.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb-slave.opt:
        Rename: mysql-test/t/rpl_ndb_innodb2ndb-slave.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb-slave.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update2-slave.opt:
        Rename: mysql-test/t/rpl_ndb_multi_update2-slave.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update2-slave.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update2.test:
        Rename: mysql-test/t/rpl_ndb_multi_update2.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update2.test
      mysql-test/suite/binlog/r/binlog_statement_insert_delayed.result:
        Rename: mysql-test/r/binlog_statement_insert_delayed.result -> mysql-test/suite/binlog/r/binlog_statement_insert_delayed.result
      mysql-test/suite/binlog/t/binlog_row_blackhole.test:
        Rename: mysql-test/t/binlog_row_blackhole.test -> mysql-test/suite/binlog/t/binlog_row_blackhole.test
      mysql-test/suite/ndb/r/ndb_limit.result:
        Rename: mysql-test/r/ndb_limit.result -> mysql-test/suite/ndb/r/ndb_limit.result
      mysql-test/suite/ndb/t/ndb_dd_basic.test:
        Rename: mysql-test/t/ndb_dd_basic.test -> mysql-test/suite/ndb/t/ndb_dd_basic.test
      mysql-test/suite/ndb/t/ndb_types.test:
        Rename: mysql-test/t/ndb_types.test -> mysql-test/suite/ndb/t/ndb_types.test
      mysql-test/suite/ndb/t/ndb_update.test:
        Rename: mysql-test/t/ndb_update.test -> mysql-test/suite/ndb/t/ndb_update.test
      mysql-test/suite/rpl/r/rpl_extraCol_innodb.result:
        Rename: mysql-test/r/rpl_extraCol_innodb.result -> mysql-test/suite/rpl/r/rpl_extraCol_innodb.result
      mysql-test/suite/rpl/r/rpl_loaddata_charset.result:
        Rename: mysql-test/r/rpl_loaddata_charset.result -> mysql-test/suite/rpl/r/rpl_loaddata_charset.result
      mysql-test/suite/rpl/r/rpl_loaddata_m.result:
        Rename: mysql-test/r/rpl_loaddata_m.result -> mysql-test/suite/rpl/r/rpl_loaddata_m.result
      mysql-test/suite/rpl/r/rpl_multi_delete.result:
        Rename: mysql-test/r/rpl_multi_delete.result -> mysql-test/suite/rpl/r/rpl_multi_delete.result
      mysql-test/suite/rpl/r/rpl_multi_delete2.result:
        Rename: mysql-test/r/rpl_multi_delete2.result -> mysql-test/suite/rpl/r/rpl_multi_delete2.result
      mysql-test/suite/rpl/r/rpl_row_sp009.result:
        Rename: mysql-test/r/rpl_row_sp009.result -> mysql-test/suite/rpl/r/rpl_row_sp009.result
      mysql-test/suite/rpl/r/rpl_row_sp010.result:
        Rename: mysql-test/r/rpl_row_sp010.result -> mysql-test/suite/rpl/r/rpl_row_sp010.result
      mysql-test/suite/rpl/r/rpl_set_charset.result:
        Rename: mysql-test/r/rpl_set_charset.result -> mysql-test/suite/rpl/r/rpl_set_charset.result
      mysql-test/suite/rpl/r/rpl_skip_error.result:
        Rename: mysql-test/r/rpl_skip_error.result -> mysql-test/suite/rpl/r/rpl_skip_error.result
      mysql-test/suite/rpl/r/rpl_stm_charset.result:
        Rename: mysql-test/r/rpl_stm_charset.result -> mysql-test/suite/rpl/r/rpl_stm_charset.result
      mysql-test/suite/rpl/r/rpl_trigger.result:
        Rename: mysql-test/r/rpl_trigger.result -> mysql-test/suite/rpl/r/rpl_trigger.result
      mysql-test/suite/rpl/t/rpl_auto_increment-master.opt:
        Rename: mysql-test/t/rpl_auto_increment-master.opt -> mysql-test/suite/rpl/t/rpl_auto_increment-master.opt
      mysql-test/suite/rpl/t/rpl_bit_npk.test:
        Rename: mysql-test/t/rpl_bit_npk.test -> mysql-test/suite/rpl/t/rpl_bit_npk.test
      mysql-test/suite/rpl/t/rpl_extraCol_innodb.test:
        Rename: mysql-test/t/rpl_extraCol_innodb.test -> mysql-test/suite/rpl/t/rpl_extraCol_innodb.test
      mysql-test/suite/rpl/t/rpl_free_items-slave.opt:
        Rename: mysql-test/t/rpl_free_items-slave.opt -> mysql-test/suite/rpl/t/rpl_free_items-slave.opt
      mysql-test/suite/rpl/t/rpl_init_slave.test:
        Rename: mysql-test/t/rpl_init_slave.test -> mysql-test/suite/rpl/t/rpl_init_slave.test
      mysql-test/suite/rpl/t/rpl_packet-slave.opt:
        Rename: mysql-test/t/rpl_packet-slave.opt -> mysql-test/suite/rpl/t/rpl_packet-slave.opt
      mysql-test/suite/rpl/t/rpl_relay_space_innodb-slave.opt:
        Rename: mysql-test/t/rpl_relay_space_innodb-slave.opt -> mysql-test/suite/rpl/t/rpl_relay_space_innodb-slave.opt
      mysql-test/suite/rpl/t/rpl_rotate_logs.slave-mi:
        Rename: mysql-test/t/rpl_rotate_logs.slave-mi -> mysql-test/suite/rpl/t/rpl_rotate_logs.slave-mi
      mysql-test/suite/rpl/t/rpl_row_USER.test:
        Rename: mysql-test/t/rpl_row_USER.test -> mysql-test/suite/rpl/t/rpl_row_USER.test
      mysql-test/suite/rpl/t/rpl_row_delayed_ins.test:
        Rename: mysql-test/t/rpl_row_delayed_ins.test -> mysql-test/suite/rpl/t/rpl_row_delayed_ins.test
      mysql-test/suite/rpl/t/rpl_row_sp002_innodb-slave.opt:
        Rename: mysql-test/t/rpl_row_sp002_innodb-slave.opt -> mysql-test/suite/rpl/t/rpl_row_sp002_innodb-slave.opt
      mysql-test/suite/rpl/t/rpl_row_trig002.test:
        Rename: mysql-test/t/rpl_row_trig002.test -> mysql-test/suite/rpl/t/rpl_row_trig002.test
      mysql-test/suite/rpl/t/rpl_sf.test:
        Rename: mysql-test/t/rpl_sf.test -> mysql-test/suite/rpl/t/rpl_sf.test
      mysql-test/suite/rpl/t/rpl_stm_no_op.test:
        Rename: mysql-test/t/rpl_stm_no_op.test -> mysql-test/suite/rpl/t/rpl_stm_no_op.test
      mysql-test/suite/rpl/t/rpl_udf-slave.opt:
        Rename: mysql-test/t/rpl_udf-slave.opt -> mysql-test/suite/rpl/t/rpl_udf-slave.opt
      mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_partitions.result:
        Rename: mysql-test/r/rpl_ndb_dd_partitions.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_partitions.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_multi.result:
        Rename: mysql-test/r/rpl_ndb_multi.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_multi.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_rep_ignore.result:
        Rename: mysql-test/r/rpl_ndb_rep_ignore.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_rep_ignore.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_sp006.result:
        Rename: mysql-test/r/rpl_ndb_sp006.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_sp006.result
      mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam-slave.opt:
        Rename: mysql-test/t/rpl_ndb_2myisam-slave.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam-slave.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_idempotent.test:
        Rename: mysql-test/t/rpl_ndb_idempotent.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_idempotent.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_sp003.test:
        Rename: mysql-test/t/rpl_ndb_sp003.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_sp003.test
      mysql-test/suite/binlog/r/binlog_row_binlog.result:
        Rename: mysql-test/r/binlog_row_binlog.result -> mysql-test/suite/binlog/r/binlog_row_binlog.result
      mysql-test/suite/binlog/r/binlog_stm_blackhole.result:
        Rename: mysql-test/r/binlog_stm_blackhole.result -> mysql-test/suite/binlog/r/binlog_stm_blackhole.result
      mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
        Rename: mysql-test/r/binlog_stm_mix_innodb_myisam.result -> mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
      mysql-test/suite/binlog/t/binlog_row_drop_tmp_tbl.test:
        Rename: mysql-test/t/binlog_row_drop_tmp_tbl.test -> mysql-test/suite/binlog/t/binlog_row_drop_tmp_tbl.test
      mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam-master.opt:
        Rename: mysql-test/t/binlog_row_mix_innodb_myisam-master.opt -> mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam-master.opt
      mysql-test/suite/binlog/t/binlog_statement_insert_delayed.test:
        Rename: mysql-test/t/binlog_statement_insert_delayed.test -> mysql-test/suite/binlog/t/binlog_statement_insert_delayed.test
      mysql-test/suite/binlog/t/binlog_stm_binlog-master.opt:
        Rename: mysql-test/t/binlog_stm_binlog-master.opt -> mysql-test/suite/binlog/t/binlog_stm_binlog-master.opt
      mysql-test/suite/ndb/r/ndb_alter_table2.result:
        Rename: mysql-test/r/ndb_alter_table2.result -> mysql-test/suite/ndb/r/ndb_alter_table2.result
      mysql-test/suite/ndb/r/ndb_blob.result:
        Rename: mysql-test/r/ndb_blob.result -> mysql-test/suite/ndb/r/ndb_blob.result
      mysql-test/suite/ndb/r/ndb_cache_multi2.result:
        Rename: mysql-test/r/ndb_cache_multi2.result -> mysql-test/suite/ndb/r/ndb_cache_multi2.result
      mysql-test/suite/ndb/r/ndb_config2.result:
        Rename: mysql-test/r/ndb_config2.result -> mysql-test/suite/ndb/r/ndb_config2.result
      mysql-test/suite/ndb/t/ndb_truncate.test:
        Rename: mysql-test/t/ndb_truncate.test -> mysql-test/suite/ndb/t/ndb_truncate.test
      mysql-test/suite/ndb/t/ndbapi.test:
        Rename: mysql-test/t/ndbapi.test -> mysql-test/suite/ndb/t/ndbapi.test
      mysql-test/suite/rpl/r/rpl_charset_sjis.result:
        Rename: mysql-test/r/rpl_charset_sjis.result -> mysql-test/suite/rpl/r/rpl_charset_sjis.result
      mysql-test/suite/rpl/r/rpl_extraCol_myisam.result:
        Rename: mysql-test/r/rpl_extraCol_myisam.result -> mysql-test/suite/rpl/r/rpl_extraCol_myisam.result
      mysql-test/suite/rpl/r/rpl_locale.result:
        Rename: mysql-test/r/rpl_locale.result -> mysql-test/suite/rpl/r/rpl_locale.result
      mysql-test/suite/rpl/r/rpl_multi_update2.result:
        Rename: mysql-test/r/rpl_multi_update2.result -> mysql-test/suite/rpl/r/rpl_multi_update2.result
      mysql-test/suite/rpl/r/rpl_relay_space_innodb.result:
        Rename: mysql-test/r/rpl_relay_space_innodb.result -> mysql-test/suite/rpl/r/rpl_relay_space_innodb.result
      mysql-test/suite/rpl/r/rpl_row_insert_delayed.result:
        Rename: mysql-test/r/rpl_row_insert_delayed.result -> mysql-test/suite/rpl/r/rpl_row_insert_delayed.result
      mysql-test/suite/rpl/r/rpl_row_log_innodb.result:
        Rename: mysql-test/r/rpl_row_log_innodb.result -> mysql-test/suite/rpl/r/rpl_row_log_innodb.result
      mysql-test/suite/rpl/r/rpl_row_multi_query.result:
        Rename: mysql-test/r/rpl_row_multi_query.result -> mysql-test/suite/rpl/r/rpl_row_multi_query.result
      mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
        Rename: mysql-test/r/rpl_row_tabledefs_3innodb.result -> mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result
      mysql-test/suite/rpl/r/rpl_row_trig003.result:
        Rename: mysql-test/r/rpl_row_trig003.result -> mysql-test/suite/rpl/r/rpl_row_trig003.result
      mysql-test/suite/rpl/r/rpl_row_until.result:
        Rename: mysql-test/r/rpl_row_until.result -> mysql-test/suite/rpl/r/rpl_row_until.result
      mysql-test/suite/rpl/t/rpl_empty_master_crash-master.opt:
        Rename: mysql-test/t/rpl_empty_master_crash-master.opt -> mysql-test/suite/rpl/t/rpl_empty_master_crash-master.opt
      mysql-test/suite/rpl/t/rpl_free_items.test:
        Rename: mysql-test/t/rpl_free_items.test -> mysql-test/suite/rpl/t/rpl_free_items.test
      mysql-test/suite/rpl/t/rpl_ps.test:
        Rename: mysql-test/t/rpl_ps.test -> mysql-test/suite/rpl/t/rpl_ps.test
      mysql-test/suite/rpl/t/rpl_relay_space_myisam.test:
        Rename: mysql-test/t/rpl_relay_space_myisam.test -> mysql-test/suite/rpl/t/rpl_relay_space_myisam.test
      mysql-test/suite/rpl/t/rpl_relayrotate.test:
        Rename: mysql-test/t/rpl_relayrotate.test -> mysql-test/suite/rpl/t/rpl_relayrotate.test
      mysql-test/suite/rpl/t/rpl_relayspace.test:
        Rename: mysql-test/t/rpl_relayspace.test -> mysql-test/suite/rpl/t/rpl_relayspace.test
      mysql-test/suite/rpl/t/rpl_row_sp003-master.opt:
        Rename: mysql-test/t/rpl_row_sp003-master.opt -> mysql-test/suite/rpl/t/rpl_row_sp003-master.opt
      mysql-test/suite/rpl_ndb/r/rpl_ndb_sync.result:
        Rename: mysql-test/r/rpl_ndb_sync.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_sync.result
      mysql-test/suite/rpl_ndb/r/rpl_ndbapi_multi.result:
        Rename: mysql-test/r/rpl_ndbapi_multi.result -> mysql-test/suite/rpl_ndb/r/rpl_ndbapi_multi.result
      mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam.test:
        Rename: mysql-test/t/rpl_ndb_2myisam.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_func003.test:
        Rename: mysql-test/t/rpl_ndb_func003.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_func003.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb_trans.test:
        Rename: mysql-test/t/rpl_ndb_innodb_trans.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb_trans.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_load.test:
        Rename: mysql-test/t/rpl_ndb_load.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_load.test
      mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb.test:
        Rename: mysql-test/t/rpl_truncate_7ndb.test -> mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb.test
      mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam.test:
        Rename: mysql-test/t/binlog_row_mix_innodb_myisam.test -> mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam.test
      mysql-test/suite/binlog/t/binlog_stm_binlog.test:
        Rename: mysql-test/t/binlog_stm_binlog.test -> mysql-test/suite/binlog/t/binlog_stm_binlog.test
      mysql-test/suite/binlog/t/binlog_stm_ctype_cp932.test:
        Rename: mysql-test/t/binlog_stm_ctype_cp932.test -> mysql-test/suite/binlog/t/binlog_stm_ctype_cp932.test
      mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam-master.opt:
        Rename: mysql-test/t/binlog_stm_mix_innodb_myisam-master.opt -> mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam-master.opt
      mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test:
        Rename: mysql-test/t/binlog_stm_mix_innodb_myisam.test -> mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test
      mysql-test/suite/ndb/r/ndb_alter_table3.result:
        Rename: mysql-test/r/ndb_alter_table3.result -> mysql-test/suite/ndb/r/ndb_alter_table3.result
      mysql-test/suite/ndb/r/ndb_autodiscover2.result:
        Rename: mysql-test/r/ndb_autodiscover2.result -> mysql-test/suite/ndb/r/ndb_autodiscover2.result
      mysql-test/suite/ndb/r/ndb_backup_print.result:
        Rename: mysql-test/r/ndb_backup_print.result -> mysql-test/suite/ndb/r/ndb_backup_print.result
      mysql-test/suite/ndb/r/ndb_binlog_basic.result:
        Rename: mysql-test/r/ndb_binlog_basic.result -> mysql-test/suite/ndb/r/ndb_binlog_basic.result
      mysql-test/suite/ndb/r/ndb_condition_pushdown.result:
        Rename: mysql-test/r/ndb_condition_pushdown.result -> mysql-test/suite/ndb/r/ndb_condition_pushdown.result
      mysql-test/suite/ndb/r/ndb_dd_ddl.result:
        Rename: mysql-test/r/ndb_dd_ddl.result -> mysql-test/suite/ndb/r/ndb_dd_ddl.result
      mysql-test/suite/ndb/r/ndb_dd_dump.result:
        Rename: mysql-test/r/ndb_dd_dump.result -> mysql-test/suite/ndb/r/ndb_dd_dump.result
      mysql-test/suite/ndb/r/ndb_loaddatalocal.result:
        Rename: mysql-test/r/ndb_loaddatalocal.result -> mysql-test/suite/ndb/r/ndb_loaddatalocal.result
      mysql-test/suite/ndb/r/ndb_restore_compat.result:
        Rename: mysql-test/r/ndb_restore_compat.result -> mysql-test/suite/ndb/r/ndb_restore_compat.result
      mysql-test/suite/ndb/r/ndb_row_format.result:
        Rename: mysql-test/r/ndb_row_format.result -> mysql-test/suite/ndb/r/ndb_row_format.result
      mysql-test/suite/ndb/r/ndb_sp.result:
        Rename: mysql-test/r/ndb_sp.result -> mysql-test/suite/ndb/r/ndb_sp.result
      mysql-test/suite/ndb/r/ndb_temporary.result:
        Rename: mysql-test/r/ndb_temporary.result -> mysql-test/suite/ndb/r/ndb_temporary.result
      mysql-test/suite/ndb/r/ps_7ndb.result:
        Rename: mysql-test/r/ps_7ndb.result -> mysql-test/suite/ndb/r/ps_7ndb.result
      mysql-test/suite/ndb/t/ndb_binlog_ddl_multi.test:
        Rename: mysql-test/t/ndb_binlog_ddl_multi.test -> mysql-test/suite/ndb/t/ndb_binlog_ddl_multi.test
      mysql-test/suite/ndb/t/ndb_cache_multi2.test:
        Rename: mysql-test/t/ndb_cache_multi2.test -> mysql-test/suite/ndb/t/ndb_cache_multi2.test
      mysql-test/suite/ndb/t/ndb_charset.test:
        Rename: mysql-test/t/ndb_charset.test -> mysql-test/suite/ndb/t/ndb_charset.test
      mysql-test/suite/ndb/t/ndb_dd_sql_features.test:
        Rename: mysql-test/t/ndb_dd_sql_features.test -> mysql-test/suite/ndb/t/ndb_dd_sql_features.test
      mysql-test/suite/ndb/t/ndb_loaddatalocal.test:
        Rename: mysql-test/t/ndb_loaddatalocal.test -> mysql-test/suite/ndb/t/ndb_loaddatalocal.test
      mysql-test/suite/ndb/t/ndb_multi_row.test:
        Rename: mysql-test/t/ndb_multi_row.test -> mysql-test/suite/ndb/t/ndb_multi_row.test
      mysql-test/suite/ndb/t/ndb_restore.test:
        Rename: mysql-test/t/ndb_restore.test -> mysql-test/suite/ndb/t/ndb_restore.test
      mysql-test/suite/ndb/t/partition_03ndb.test:
        Rename: mysql-test/t/partition_03ndb.test -> mysql-test/suite/ndb/t/partition_03ndb.test
      mysql-test/suite/ndb/t/ps_7ndb.test:
        Rename: mysql-test/t/ps_7ndb.test -> mysql-test/suite/ndb/t/ps_7ndb.test
      mysql-test/suite/rpl/r/rpl000013.result:
        Rename: mysql-test/r/rpl000013.result -> mysql-test/suite/rpl/r/rpl000013.result
      mysql-test/suite/rpl/r/rpl_auto_increment_11932.result:
        Rename: mysql-test/r/rpl_auto_increment_11932.result -> mysql-test/suite/rpl/r/rpl_auto_increment_11932.result
      mysql-test/suite/rpl/r/rpl_change_master.result:
        Rename: mysql-test/r/rpl_change_master.result -> mysql-test/suite/rpl/r/rpl_change_master.result
      mysql-test/suite/rpl/r/rpl_foreign_key_innodb.result:
        Rename: mysql-test/r/rpl_foreign_key_innodb.result -> mysql-test/suite/rpl/r/rpl_foreign_key_innodb.result
      mysql-test/suite/rpl/r/rpl_insert_select.result:
        Rename: mysql-test/r/rpl_insert_select.result -> mysql-test/suite/rpl/r/rpl_insert_select.result
      mysql-test/suite/rpl/r/rpl_mixed_ddl_dml.result:
        Rename: mysql-test/r/rpl_mixed_ddl_dml.result -> mysql-test/suite/rpl/r/rpl_mixed_ddl_dml.result
      mysql-test/suite/rpl/r/rpl_replicate_do.result:
        Rename: mysql-test/r/rpl_replicate_do.result -> mysql-test/suite/rpl/r/rpl_replicate_do.result
      mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result:
        Rename: mysql-test/r/rpl_row_basic_2myisam.result -> mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result
      mysql-test/suite/rpl/r/rpl_row_sp011.result:
        Rename: mysql-test/r/rpl_row_sp011.result -> mysql-test/suite/rpl/r/rpl_row_sp011.result
      mysql-test/suite/rpl/r/rpl_row_trig004.result:
        Rename: mysql-test/r/rpl_row_trig004.result -> mysql-test/suite/rpl/r/rpl_row_trig004.result
      mysql-test/suite/rpl/r/rpl_slave_status.result:
        Rename: mysql-test/r/rpl_slave_status.result -> mysql-test/suite/rpl/r/rpl_slave_status.result
      mysql-test/suite/rpl/r/rpl_stm_log.result:
        Rename: mysql-test/r/rpl_stm_log.result -> mysql-test/suite/rpl/r/rpl_stm_log.result
      mysql-test/suite/rpl/r/rpl_stm_max_relay_size.result:
        Rename: mysql-test/r/rpl_stm_max_relay_size.result -> mysql-test/suite/rpl/r/rpl_stm_max_relay_size.result
      mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result:
        Rename: mysql-test/r/rpl_switch_stm_row_mixed.result -> mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result
      mysql-test/suite/rpl/r/rpl_temp_table.result:
        Rename: mysql-test/r/rpl_temp_table.result -> mysql-test/suite/rpl/r/rpl_temp_table.result
      mysql-test/suite/rpl/r/rpl_timezone.result:
        Rename: mysql-test/r/rpl_timezone.result -> mysql-test/suite/rpl/r/rpl_timezone.result
      mysql-test/suite/rpl/t/rpl000017-slave.sh:
        Rename: mysql-test/t/rpl000017-slave.sh -> mysql-test/suite/rpl/t/rpl000017-slave.sh
      mysql-test/suite/rpl/t/rpl000018-slave.opt:
        Rename: mysql-test/t/rpl000018-slave.opt -> mysql-test/suite/rpl/t/rpl000018-slave.opt
      mysql-test/suite/rpl/t/rpl_auto_increment_11932.test:
        Rename: mysql-test/t/rpl_auto_increment_11932.test -> mysql-test/suite/rpl/t/rpl_auto_increment_11932.test
      mysql-test/suite/rpl/t/rpl_commit_after_flush.test:
        Rename: mysql-test/t/rpl_commit_after_flush.test -> mysql-test/suite/rpl/t/rpl_commit_after_flush.test
      mysql-test/suite/rpl/t/rpl_create_database-master.opt:
        Rename: mysql-test/t/rpl_create_database-master.opt -> mysql-test/suite/rpl/t/rpl_create_database-master.opt
      mysql-test/suite/rpl/t/rpl_deadlock_innodb-slave.opt:
        Rename: mysql-test/t/rpl_deadlock_innodb-slave.opt -> mysql-test/suite/rpl/t/rpl_deadlock_innodb-slave.opt
      mysql-test/suite/rpl/t/rpl_drop.test:
        Rename: mysql-test/t/rpl_drop.test -> mysql-test/suite/rpl/t/rpl_drop.test
      mysql-test/suite/rpl/t/rpl_empty_master_crash.test:
        Rename: mysql-test/t/rpl_empty_master_crash.test -> mysql-test/suite/rpl/t/rpl_empty_master_crash.test
      mysql-test/suite/rpl/t/rpl_flushlog_loop-slave.opt:
        Rename: mysql-test/t/rpl_flushlog_loop-slave.opt -> mysql-test/suite/rpl/t/rpl_flushlog_loop-slave.opt
      mysql-test/suite/rpl/t/rpl_ignore_table_update.test:
        Rename: mysql-test/t/rpl_ignore_table_update.test -> mysql-test/suite/rpl/t/rpl_ignore_table_update.test
      mysql-test/suite/rpl/t/rpl_innodb.test:
        Rename: mysql-test/t/rpl_innodb.test -> mysql-test/suite/rpl/t/rpl_innodb.test
      mysql-test/suite/rpl/t/rpl_known_bugs_detection.test:
        Rename: mysql-test/t/rpl_known_bugs_detection.test -> mysql-test/suite/rpl/t/rpl_known_bugs_detection.test
      mysql-test/suite/rpl/t/rpl_multi_update4-slave.opt:
        Rename: mysql-test/t/rpl_multi_update4-slave.opt -> mysql-test/suite/rpl/t/rpl_multi_update4-slave.opt
      mysql-test/suite/rpl/t/rpl_packet-master.opt:
        Rename: mysql-test/t/rpl_packet-master.opt -> mysql-test/suite/rpl/t/rpl_packet-master.opt
      mysql-test/suite/rpl/t/rpl_row_4_bytes-master.opt:
        Rename: mysql-test/t/rpl_row_4_bytes-master.opt -> mysql-test/suite/rpl/t/rpl_row_4_bytes-master.opt
      mysql-test/suite/rpl/t/rpl_row_basic_3innodb.test:
        Rename: mysql-test/t/rpl_row_basic_3innodb.test -> mysql-test/suite/rpl/t/rpl_row_basic_3innodb.test
      mysql-test/suite/rpl/t/rpl_row_func001.test:
        Rename: mysql-test/t/rpl_row_func001.test -> mysql-test/suite/rpl/t/rpl_row_func001.test
      mysql-test/suite/rpl/t/rpl_row_func003-slave.opt:
        Rename: mysql-test/t/rpl_row_func003-slave.opt -> mysql-test/suite/rpl/t/rpl_row_func003-slave.opt
      mysql-test/suite/rpl/t/rpl_row_until.test:
        Rename: mysql-test/t/rpl_row_until.test -> mysql-test/suite/rpl/t/rpl_row_until.test
      mysql-test/suite/rpl/t/rpl_set_charset.test:
        Rename: mysql-test/t/rpl_set_charset.test -> mysql-test/suite/rpl/t/rpl_set_charset.test
      mysql-test/suite/rpl/t/rpl_skip_error-slave.opt:
        Rename: mysql-test/t/rpl_skip_error-slave.opt -> mysql-test/suite/rpl/t/rpl_skip_error-slave.opt
      mysql-test/suite/rpl/t/rpl_slave_status.test:
        Rename: mysql-test/t/rpl_slave_status.test -> mysql-test/suite/rpl/t/rpl_slave_status.test
      mysql-test/suite/rpl/t/rpl_sp-master.opt:
        Rename: mysql-test/t/rpl_sp-master.opt -> mysql-test/suite/rpl/t/rpl_sp-master.opt
      mysql-test/suite/rpl/t/rpl_sp004.test:
        Rename: mysql-test/t/rpl_sp004.test -> mysql-test/suite/rpl/t/rpl_sp004.test
      mysql-test/suite/rpl/t/rpl_start_stop_slave.test:
        Rename: mysql-test/t/rpl_start_stop_slave.test -> mysql-test/suite/rpl/t/rpl_start_stop_slave.test
      mysql-test/suite/rpl/t/rpl_stm_flsh_tbls.test:
        Rename: mysql-test/t/rpl_stm_flsh_tbls.test -> mysql-test/suite/rpl/t/rpl_stm_flsh_tbls.test
      mysql-test/suite/rpl/t/rpl_stm_log.test:
        Rename: mysql-test/t/rpl_stm_log.test -> mysql-test/suite/rpl/t/rpl_stm_log.test
      mysql-test/suite/rpl/t/rpl_truncate_2myisam.test:
        Rename: mysql-test/t/rpl_truncate_2myisam.test -> mysql-test/suite/rpl/t/rpl_truncate_2myisam.test
      mysql-test/suite/rpl_ndb/r/rpl_ndb_UUID.result:
        Rename: mysql-test/r/rpl_ndb_UUID.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_UUID.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_insert_ignore.result:
        Rename: mysql-test/r/rpl_ndb_insert_ignore.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_insert_ignore.result
      mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test:
        Rename: mysql-test/t/rpl_ndb_circular.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_commit_afterflush.test:
        Rename: mysql-test/t/rpl_ndb_commit_afterflush.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_commit_afterflush.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_relayrotate.test:
        Rename: mysql-test/t/rpl_ndb_relayrotate.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_relayrotate.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_rep_ignore-slave.opt:
        Rename: mysql-test/t/rpl_ndb_rep_ignore-slave.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_rep_ignore-slave.opt
      mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result:
        Rename: mysql-test/r/binlog_stm_ctype_ucs.result -> mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result
      mysql-test/suite/binlog/t/binlog_stm_drop_tmp_tbl.test:
        Rename: mysql-test/t/binlog_stm_drop_tmp_tbl.test -> mysql-test/suite/binlog/t/binlog_stm_drop_tmp_tbl.test
      mysql-test/suite/binlog/t/binlog_stm_innodb_stat-master.opt:
        Rename: mysql-test/t/binlog_stm_innodb_stat-master.opt -> mysql-test/suite/binlog/t/binlog_stm_innodb_stat-master.opt
      mysql-test/suite/ndb/r/loaddata_autocom_ndb.result:
        Rename: mysql-test/r/loaddata_autocom_ndb.result -> mysql-test/suite/ndb/r/loaddata_autocom_ndb.result
      mysql-test/suite/ndb/r/ndb_autodiscover3.result:
        Rename: mysql-test/r/ndb_autodiscover3.result -> mysql-test/suite/ndb/r/ndb_autodiscover3.result
      mysql-test/suite/ndb/r/ndb_binlog_basic2.result:
        Rename: mysql-test/r/ndb_binlog_basic2.result -> mysql-test/suite/ndb/r/ndb_binlog_basic2.result
      mysql-test/suite/ndb/r/ndb_blob_partition.result:
        Rename: mysql-test/r/ndb_blob_partition.result -> mysql-test/suite/ndb/r/ndb_blob_partition.result
      mysql-test/suite/ndb/r/ndb_insert.result:
        Rename: mysql-test/r/ndb_insert.result -> mysql-test/suite/ndb/r/ndb_insert.result
      mysql-test/suite/ndb/r/ndb_partition_error2.result:
        Rename: mysql-test/r/ndb_partition_error2.result -> mysql-test/suite/ndb/r/ndb_partition_error2.result
      mysql-test/suite/ndb/r/ndb_partition_list.result:
        Rename: mysql-test/r/ndb_partition_list.result -> mysql-test/suite/ndb/r/ndb_partition_list.result
      mysql-test/suite/ndb/r/ndb_restore_print.result:
        Rename: mysql-test/r/ndb_restore_print.result -> mysql-test/suite/ndb/r/ndb_restore_print.result
      mysql-test/suite/ndb/r/ndb_transaction.result:
        Rename: mysql-test/r/ndb_transaction.result -> mysql-test/suite/ndb/r/ndb_transaction.result
      mysql-test/suite/ndb/r/partition_03ndb.result:
        Rename: mysql-test/r/partition_03ndb.result -> mysql-test/suite/ndb/r/partition_03ndb.result
      mysql-test/suite/ndb/t/loaddata_autocom_ndb.test:
        Rename: mysql-test/t/loaddata_autocom_ndb.test -> mysql-test/suite/ndb/t/loaddata_autocom_ndb.test
      mysql-test/suite/ndb/t/ndb_autodiscover3.test:
        Rename: mysql-test/t/ndb_autodiscover3.test -> mysql-test/suite/ndb/t/ndb_autodiscover3.test
      mysql-test/suite/ndb/t/ndb_config2.test:
        Rename: mysql-test/t/ndb_config2.test -> mysql-test/suite/ndb/t/ndb_config2.test
      mysql-test/suite/ndb/t/ndb_cursor.test:
        Rename: mysql-test/t/ndb_cursor.test -> mysql-test/suite/ndb/t/ndb_cursor.test
      mysql-test/suite/ndb/t/ndb_database.test:
        Rename: mysql-test/t/ndb_database.test -> mysql-test/suite/ndb/t/ndb_database.test
      mysql-test/suite/ndb/t/ndb_index_ordered.test:
        Rename: mysql-test/t/ndb_index_ordered.test -> mysql-test/suite/ndb/t/ndb_index_ordered.test
      mysql-test/suite/ndb/t/ndb_restore_partition-master.opt:
        Rename: mysql-test/t/ndb_restore_partition-master.opt -> mysql-test/suite/ndb/t/ndb_restore_partition-master.opt
      mysql-test/suite/rpl/r/rpl_000015.result:
        Rename: mysql-test/r/rpl_000015.result -> mysql-test/suite/rpl/r/rpl_000015.result
      mysql-test/suite/rpl/r/rpl_bit_npk.result:
        Rename: mysql-test/r/rpl_bit_npk.result -> mysql-test/suite/rpl/r/rpl_bit_npk.result
      mysql-test/suite/rpl/r/rpl_critical_errors.result:
        Rename: mysql-test/r/rpl_critical_errors.result -> mysql-test/suite/rpl/r/rpl_critical_errors.result
      mysql-test/suite/rpl/r/rpl_delete_no_where.result:
        Rename: mysql-test/r/rpl_delete_no_where.result -> mysql-test/suite/rpl/r/rpl_delete_no_where.result
      mysql-test/suite/rpl/r/rpl_do_grant.result:
        Rename: mysql-test/r/rpl_do_grant.result -> mysql-test/suite/rpl/r/rpl_do_grant.result
      mysql-test/suite/rpl/r/rpl_events.result:
        Rename: mysql-test/r/rpl_events.result -> mysql-test/suite/rpl/r/rpl_events.result
      mysql-test/suite/rpl/r/rpl_get_lock.result:
        Rename: mysql-test/r/rpl_get_lock.result -> mysql-test/suite/rpl/r/rpl_get_lock.result
      mysql-test/suite/rpl/r/rpl_incident.result:
        Rename: mysql-test/r/rpl_incident.result -> mysql-test/suite/rpl/r/rpl_incident.result
      mysql-test/suite/rpl/r/rpl_init_slave.result:
        Rename: mysql-test/r/rpl_init_slave.result -> mysql-test/suite/rpl/r/rpl_init_slave.result
      mysql-test/suite/rpl/r/rpl_insert.result:
        Rename: mysql-test/r/rpl_insert.result -> mysql-test/suite/rpl/r/rpl_insert.result
      mysql-test/suite/rpl/r/rpl_insert_id.result:
        Rename: mysql-test/r/rpl_insert_id.result -> mysql-test/suite/rpl/r/rpl_insert_id.result
      mysql-test/suite/rpl/r/rpl_loaddata_s.result:
        Rename: mysql-test/r/rpl_loaddata_s.result -> mysql-test/suite/rpl/r/rpl_loaddata_s.result
      mysql-test/suite/rpl/r/rpl_multi_update4.result:
        Rename: mysql-test/r/rpl_multi_update4.result -> mysql-test/suite/rpl/r/rpl_multi_update4.result
      mysql-test/suite/rpl/r/rpl_optimize.result:
        Rename: mysql-test/r/rpl_optimize.result -> mysql-test/suite/rpl/r/rpl_optimize.result
      mysql-test/suite/rpl/r/rpl_row_blob_innodb.result:
        Rename: mysql-test/r/rpl_row_blob_innodb.result -> mysql-test/suite/rpl/r/rpl_row_blob_innodb.result
      mysql-test/suite/rpl/r/rpl_row_charset.result:
        Rename: mysql-test/r/rpl_row_charset.result -> mysql-test/suite/rpl/r/rpl_row_charset.result
      mysql-test/suite/rpl/r/rpl_row_drop.result:
        Rename: mysql-test/r/rpl_row_drop.result -> mysql-test/suite/rpl/r/rpl_row_drop.result
      mysql-test/suite/rpl/r/rpl_row_sp001.result:
        Rename: mysql-test/r/rpl_row_sp001.result -> mysql-test/suite/rpl/r/rpl_row_sp001.result
      mysql-test/suite/rpl/r/rpl_row_sp006_InnoDB.result:
        Rename: mysql-test/r/rpl_row_sp006_InnoDB.result -> mysql-test/suite/rpl/r/rpl_row_sp006_InnoDB.result
      mysql-test/suite/rpl/r/rpl_row_sp012.result:
        Rename: mysql-test/r/rpl_row_sp012.result -> mysql-test/suite/rpl/r/rpl_row_sp012.result
      mysql-test/suite/rpl/r/rpl_row_stop_middle.result:
        Rename: mysql-test/r/rpl_row_stop_middle.result -> mysql-test/suite/rpl/r/rpl_row_stop_middle.result
      mysql-test/suite/rpl/r/rpl_sp_effects.result:
        Rename: mysql-test/r/rpl_sp_effects.result -> mysql-test/suite/rpl/r/rpl_sp_effects.result
      mysql-test/suite/rpl/r/rpl_stm_flsh_tbls.result:
        Rename: mysql-test/r/rpl_stm_flsh_tbls.result -> mysql-test/suite/rpl/r/rpl_stm_flsh_tbls.result
      mysql-test/suite/rpl/r/rpl_stm_mystery22.result:
        Rename: mysql-test/r/rpl_stm_mystery22.result -> mysql-test/suite/rpl/r/rpl_stm_mystery22.result
      mysql-test/suite/rpl/t/rpl000010.test:
        Rename: mysql-test/t/rpl000010.test -> mysql-test/suite/rpl/t/rpl000010.test
      mysql-test/suite/rpl/t/rpl000017.test:
        Rename: mysql-test/t/rpl000017.test -> mysql-test/suite/rpl/t/rpl000017.test
      mysql-test/suite/rpl/t/rpl_000015.slave-mi:
        Rename: mysql-test/t/rpl_000015.slave-mi -> mysql-test/suite/rpl/t/rpl_000015.slave-mi
      mysql-test/suite/rpl/t/rpl_EE_err.test:
        Rename: mysql-test/t/rpl_EE_err.test -> mysql-test/suite/rpl/t/rpl_EE_err.test
      mysql-test/suite/rpl/t/rpl_LD_INFILE.test:
        Rename: mysql-test/t/rpl_LD_INFILE.test -> mysql-test/suite/rpl/t/rpl_LD_INFILE.test
      mysql-test/suite/rpl/t/rpl_charset_sjis.test:
        Rename: mysql-test/t/rpl_charset_sjis.test -> mysql-test/suite/rpl/t/rpl_charset_sjis.test
      mysql-test/suite/rpl/t/rpl_create_database-slave.opt:
        Rename: mysql-test/t/rpl_create_database-slave.opt -> mysql-test/suite/rpl/t/rpl_create_database-slave.opt
      mysql-test/suite/rpl/t/rpl_err_ignoredtable.test:
        Rename: mysql-test/t/rpl_err_ignoredtable.test -> mysql-test/suite/rpl/t/rpl_err_ignoredtable.test
      mysql-test/suite/rpl/t/rpl_extraCol_innodb-master.opt:
        Rename: mysql-test/t/rpl_extraCol_innodb-master.opt -> mysql-test/suite/rpl/t/rpl_extraCol_innodb-master.opt
      mysql-test/suite/rpl/t/rpl_extraCol_myisam.test:
        Rename: mysql-test/t/rpl_extraCol_myisam.test -> mysql-test/suite/rpl/t/rpl_extraCol_myisam.test
      mysql-test/suite/rpl/t/rpl_failed_optimize.test:
        Rename: mysql-test/t/rpl_failed_optimize.test -> mysql-test/suite/rpl/t/rpl_failed_optimize.test
      mysql-test/suite/rpl/t/rpl_foreign_key_innodb-slave.opt:
        Rename: mysql-test/t/rpl_foreign_key_innodb-slave.opt -> mysql-test/suite/rpl/t/rpl_foreign_key_innodb-slave.opt
      mysql-test/suite/rpl/t/rpl_insert_id-slave.opt:
        Rename: mysql-test/t/rpl_insert_id-slave.opt -> mysql-test/suite/rpl/t/rpl_insert_id-slave.opt
      mysql-test/suite/rpl/t/rpl_load_table_from_master.test:
        Rename: mysql-test/t/rpl_load_table_from_master.test -> mysql-test/suite/rpl/t/rpl_load_table_from_master.test
      mysql-test/suite/rpl/t/rpl_loaddata.test:
        Rename: mysql-test/t/rpl_loaddata.test -> mysql-test/suite/rpl/t/rpl_loaddata.test
      mysql-test/suite/rpl/t/rpl_loaddata_s.test:
        Rename: mysql-test/t/rpl_loaddata_s.test -> mysql-test/suite/rpl/t/rpl_loaddata_s.test
      mysql-test/suite/rpl/t/rpl_master_pos_wait.test:
        Rename: mysql-test/t/rpl_master_pos_wait.test -> mysql-test/suite/rpl/t/rpl_master_pos_wait.test
      mysql-test/suite/rpl/t/rpl_misc_functions-slave.sh:
        Rename: mysql-test/t/rpl_misc_functions-slave.sh -> mysql-test/suite/rpl/t/rpl_misc_functions-slave.sh
      mysql-test/suite/rpl/t/rpl_multi_update2.test:
        Rename: mysql-test/t/rpl_multi_update2.test -> mysql-test/suite/rpl/t/rpl_multi_update2.test
      mysql-test/suite/rpl/t/rpl_packet.test:
        Rename: mysql-test/t/rpl_packet.test -> mysql-test/suite/rpl/t/rpl_packet.test
      mysql-test/suite/rpl/t/rpl_relay_space_innodb-master.opt:
        Rename: mysql-test/t/rpl_relay_space_innodb-master.opt -> mysql-test/suite/rpl/t/rpl_relay_space_innodb-master.opt
      mysql-test/suite/rpl/t/rpl_row_basic_11bugs-slave.opt:
        Rename: mysql-test/t/rpl_row_basic_11bugs-slave.opt -> mysql-test/suite/rpl/t/rpl_row_basic_11bugs-slave.opt
      mysql-test/suite/rpl/t/rpl_row_inexist_tbl-slave.opt:
        Rename: mysql-test/t/rpl_row_inexist_tbl-slave.opt -> mysql-test/suite/rpl/t/rpl_row_inexist_tbl-slave.opt
      mysql-test/suite/rpl/t/rpl_row_insert_delayed.test:
        Rename: mysql-test/t/rpl_row_insert_delayed.test -> mysql-test/suite/rpl/t/rpl_row_insert_delayed.test
      mysql-test/suite/rpl/t/rpl_row_log_innodb-slave.opt:
        Rename: mysql-test/t/rpl_row_log_innodb-slave.opt -> mysql-test/suite/rpl/t/rpl_row_log_innodb-slave.opt
      mysql-test/suite/rpl/t/rpl_row_max_relay_size.test:
        Rename: mysql-test/t/rpl_row_max_relay_size.test -> mysql-test/suite/rpl/t/rpl_row_max_relay_size.test
      mysql-test/suite/rpl/t/rpl_row_sp002_innodb.test:
        Rename: mysql-test/t/rpl_row_sp002_innodb.test -> mysql-test/suite/rpl/t/rpl_row_sp002_innodb.test
      mysql-test/suite/rpl/t/rpl_row_sp003-slave.opt:
        Rename: mysql-test/t/rpl_row_sp003-slave.opt -> mysql-test/suite/rpl/t/rpl_row_sp003-slave.opt
      mysql-test/suite/rpl/t/rpl_row_sp006_InnoDB-slave.opt:
        Rename: mysql-test/t/rpl_row_sp006_InnoDB-slave.opt -> mysql-test/suite/rpl/t/rpl_row_sp006_InnoDB-slave.opt
      mysql-test/suite/rpl/t/rpl_row_sp012.test:
        Rename: mysql-test/t/rpl_row_sp012.test -> mysql-test/suite/rpl/t/rpl_row_sp012.test
      mysql-test/suite/rpl/t/rpl_row_stop_middle_update.test:
        Rename: mysql-test/t/rpl_row_stop_middle_update.test -> mysql-test/suite/rpl/t/rpl_row_stop_middle_update.test
      mysql-test/suite/rpl/t/rpl_row_tabledefs_2myisam.test:
        Rename: mysql-test/t/rpl_row_tabledefs_2myisam.test -> mysql-test/suite/rpl/t/rpl_row_tabledefs_2myisam.test
      mysql-test/suite/rpl/t/rpl_row_trig003.test:
        Rename: mysql-test/t/rpl_row_trig003.test -> mysql-test/suite/rpl/t/rpl_row_trig003.test
      mysql-test/suite/rpl/t/rpl_server_id2.test:
        Rename: mysql-test/t/rpl_server_id2.test -> mysql-test/suite/rpl/t/rpl_server_id2.test
      mysql-test/suite/rpl/t/rpl_sporadic_master.test:
        Rename: mysql-test/t/rpl_sporadic_master.test -> mysql-test/suite/rpl/t/rpl_sporadic_master.test
      mysql-test/suite/rpl/t/rpl_stm_000001.test:
        Rename: mysql-test/t/rpl_stm_000001.test -> mysql-test/suite/rpl/t/rpl_stm_000001.test
      mysql-test/suite/rpl/t/rpl_stm_reset_slave.test:
        Rename: mysql-test/t/rpl_stm_reset_slave.test -> mysql-test/suite/rpl/t/rpl_stm_reset_slave.test
      mysql-test/suite/rpl/t/rpl_temp_table.test:
        Rename: mysql-test/t/rpl_temp_table.test -> mysql-test/suite/rpl/t/rpl_temp_table.test
      mysql-test/suite/rpl/t/rpl_timezone-slave.opt:
        Rename: mysql-test/t/rpl_timezone-slave.opt -> mysql-test/suite/rpl/t/rpl_timezone-slave.opt
      mysql-test/suite/rpl_ndb/r/rpl_ndb_2innodb.result:
        Rename: mysql-test/r/rpl_ndb_2innodb.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_2innodb.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result:
        Rename: mysql-test/r/rpl_ndb_circular.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_innodb_trans.result:
        Rename: mysql-test/r/rpl_ndb_innodb_trans.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_innodb_trans.result
      mysql-test/suite/rpl_ndb/t/rpl_ndb_blob2.test:
        Rename: mysql-test/t/rpl_ndb_blob2.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_blob2.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_do_table-slave.opt:
        Rename: mysql-test/t/rpl_ndb_do_table-slave.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_do_table-slave.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb.test:
        Rename: mysql-test/t/rpl_ndb_innodb2ndb.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_insert_ignore.test:
        Rename: mysql-test/t/rpl_ndb_insert_ignore.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_insert_ignore.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update3.test:
        Rename: mysql-test/t/rpl_ndb_multi_update3.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update3.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb.test:
        Rename: mysql-test/t/rpl_ndb_myisam2ndb.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb.test
      mysql-test/suite/binlog/r/binlog_stm_drop_tmp_tbl.result:
        Rename: mysql-test/r/binlog_stm_drop_tmp_tbl.result -> mysql-test/suite/binlog/r/binlog_stm_drop_tmp_tbl.result
      mysql-test/suite/binlog/r/binlog_stm_innodb_stat.result:
        Rename: mysql-test/r/binlog_stm_innodb_stat.result -> mysql-test/suite/binlog/r/binlog_stm_innodb_stat.result
      mysql-test/suite/binlog/t/binlog_stm_blackhole.test:
        Rename: mysql-test/t/binlog_stm_blackhole.test -> mysql-test/suite/binlog/t/binlog_stm_blackhole.test
      mysql-test/suite/binlog/t/binlog_stm_insert_select.test:
        Rename: mysql-test/t/binlog_stm_insert_select.test -> mysql-test/suite/binlog/t/binlog_stm_insert_select.test
      mysql-test/suite/ndb/r/ndb_binlog_discover.result:
        Rename: mysql-test/r/ndb_binlog_discover.result -> mysql-test/suite/ndb/r/ndb_binlog_discover.result
      mysql-test/suite/ndb/r/ndb_bitfield.result:
        Rename: mysql-test/r/ndb_bitfield.result -> mysql-test/suite/ndb/r/ndb_bitfield.result
      mysql-test/suite/ndb/r/ndb_minmax.result:
        Rename: mysql-test/r/ndb_minmax.result -> mysql-test/suite/ndb/r/ndb_minmax.result
      mysql-test/suite/ndb/r/ndb_single_user.result:
        Rename: mysql-test/r/ndb_single_user.result -> mysql-test/suite/ndb/r/ndb_single_user.result
      mysql-test/suite/ndb/r/ndb_subquery.result:
        Rename: mysql-test/r/ndb_subquery.result -> mysql-test/suite/ndb/r/ndb_subquery.result
      mysql-test/suite/ndb/t/ndb_binlog_log_bin.test:
        Rename: mysql-test/t/ndb_binlog_log_bin.test -> mysql-test/suite/ndb/t/ndb_binlog_log_bin.test
      mysql-test/suite/ndb/t/ndb_config.test:
        Rename: mysql-test/t/ndb_config.test -> mysql-test/suite/ndb/t/ndb_config.test
      mysql-test/suite/ndb/t/ndb_replace.test:
        Rename: mysql-test/t/ndb_replace.test -> mysql-test/suite/ndb/t/ndb_replace.test
      mysql-test/suite/ndb/t/ndb_transaction.test:
        Rename: mysql-test/t/ndb_transaction.test -> mysql-test/suite/ndb/t/ndb_transaction.test
      mysql-test/suite/ndb/t/ndb_trigger.test:
        Rename: mysql-test/t/ndb_trigger.test -> mysql-test/suite/ndb/t/ndb_trigger.test
      mysql-test/suite/ndb/t/ndb_view.test:
        Rename: mysql-test/t/ndb_view.test -> mysql-test/suite/ndb/t/ndb_view.test
      mysql-test/suite/rpl/r/rpl000011.result:
        Rename: mysql-test/r/rpl000011.result -> mysql-test/suite/rpl/r/rpl000011.result
      mysql-test/suite/rpl/r/rpl_free_items.result:
        Rename: mysql-test/r/rpl_free_items.result -> mysql-test/suite/rpl/r/rpl_free_items.result
      mysql-test/suite/rpl/r/rpl_ignore_revoke.result:
        Rename: mysql-test/r/rpl_ignore_revoke.result -> mysql-test/suite/rpl/r/rpl_ignore_revoke.result
      mysql-test/suite/rpl/r/rpl_innodb.result:
        Rename: mysql-test/r/rpl_innodb.result -> mysql-test/suite/rpl/r/rpl_innodb.result
      mysql-test/suite/rpl/r/rpl_loadfile.result:
        Rename: mysql-test/r/rpl_loadfile.result -> mysql-test/suite/rpl/r/rpl_loadfile.result
      mysql-test/suite/rpl/r/rpl_multi_update.result:
        Rename: mysql-test/r/rpl_multi_update.result -> mysql-test/suite/rpl/r/rpl_multi_update.result
      mysql-test/suite/rpl/r/rpl_ps.result:
        Rename: mysql-test/r/rpl_ps.result -> mysql-test/suite/rpl/r/rpl_ps.result
      mysql-test/suite/rpl/r/rpl_read_only.result:
        Rename: mysql-test/r/rpl_read_only.result -> mysql-test/suite/rpl/r/rpl_read_only.result
      mysql-test/suite/rpl/r/rpl_replicate_ignore_db.result:
        Rename: mysql-test/r/rpl_replicate_ignore_db.result -> mysql-test/suite/rpl/r/rpl_replicate_ignore_db.result
      mysql-test/suite/rpl/r/rpl_row_4_bytes.result:
        Rename: mysql-test/r/rpl_row_4_bytes.result -> mysql-test/suite/rpl/r/rpl_row_4_bytes.result
      mysql-test/suite/rpl/r/rpl_row_USER.result:
        Rename: mysql-test/r/rpl_row_USER.result -> mysql-test/suite/rpl/r/rpl_row_USER.result
      mysql-test/suite/rpl/r/rpl_row_UUID.result:
        Rename: mysql-test/r/rpl_row_UUID.result -> mysql-test/suite/rpl/r/rpl_row_UUID.result
      mysql-test/suite/rpl/r/rpl_row_blob_myisam.result:
        Rename: mysql-test/r/rpl_row_blob_myisam.result -> mysql-test/suite/rpl/r/rpl_row_blob_myisam.result
      mysql-test/suite/rpl/r/rpl_row_err_ignoredtable.result:
        Rename: mysql-test/r/rpl_row_err_ignoredtable.result -> mysql-test/suite/rpl/r/rpl_row_err_ignoredtable.result
      mysql-test/suite/rpl/r/rpl_row_sp002_innodb.result:
        Rename: mysql-test/r/rpl_row_sp002_innodb.result -> mysql-test/suite/rpl/r/rpl_row_sp002_innodb.result
      mysql-test/suite/rpl/r/rpl_row_sp007_innodb.result:
        Rename: mysql-test/r/rpl_row_sp007_innodb.result -> mysql-test/suite/rpl/r/rpl_row_sp007_innodb.result
      mysql-test/suite/rpl/r/rpl_ssl1.result:
        Rename: mysql-test/r/rpl_ssl1.result -> mysql-test/suite/rpl/r/rpl_ssl1.result
      mysql-test/suite/rpl/r/rpl_stm_000001.result:
        Rename: mysql-test/r/rpl_stm_000001.result -> mysql-test/suite/rpl/r/rpl_stm_000001.result
      mysql-test/suite/rpl/r/rpl_truncate_2myisam.result:
        Rename: mysql-test/r/rpl_truncate_2myisam.result -> mysql-test/suite/rpl/r/rpl_truncate_2myisam.result
      mysql-test/suite/rpl/t/rpl000018-master.opt:
        Rename: mysql-test/t/rpl000018-master.opt -> mysql-test/suite/rpl/t/rpl000018-master.opt
      mysql-test/suite/rpl/t/rpl_000015.test:
        Rename: mysql-test/t/rpl_000015.test -> mysql-test/suite/rpl/t/rpl_000015.test
      mysql-test/suite/rpl/t/rpl_drop_temp.test:
        Rename: mysql-test/t/rpl_drop_temp.test -> mysql-test/suite/rpl/t/rpl_drop_temp.test
      mysql-test/suite/rpl/t/rpl_err_ignoredtable-slave.opt:
        Rename: mysql-test/t/rpl_err_ignoredtable-slave.opt -> mysql-test/suite/rpl/t/rpl_err_ignoredtable-slave.opt
      mysql-test/suite/rpl/t/rpl_failed_optimize-master.opt:
        Rename: mysql-test/t/rpl_failed_optimize-master.opt -> mysql-test/suite/rpl/t/rpl_failed_optimize-master.opt
      mysql-test/suite/rpl/t/rpl_foreign_key_innodb.test:
        Rename: mysql-test/t/rpl_foreign_key_innodb.test -> mysql-test/suite/rpl/t/rpl_foreign_key_innodb.test
      mysql-test/suite/rpl/t/rpl_ignore_table.test:
        Rename: mysql-test/t/rpl_ignore_table.test -> mysql-test/suite/rpl/t/rpl_ignore_table.test
      mysql-test/suite/rpl/t/rpl_ignore_table_update-slave.opt:
        Rename: mysql-test/t/rpl_ignore_table_update-slave.opt -> mysql-test/suite/rpl/t/rpl_ignore_table_update-slave.opt
      mysql-test/suite/rpl/t/rpl_incident-master.opt:
        Rename: mysql-test/t/rpl_incident-master.opt -> mysql-test/suite/rpl/t/rpl_incident-master.opt
      mysql-test/suite/rpl/t/rpl_insert_id_pk-slave.opt:
        Rename: mysql-test/t/rpl_insert_id_pk-slave.opt -> mysql-test/suite/rpl/t/rpl_insert_id_pk-slave.opt
      mysql-test/suite/rpl/t/rpl_loaddata_m-master.opt:
        Rename: mysql-test/t/rpl_loaddata_m-master.opt -> mysql-test/suite/rpl/t/rpl_loaddata_m-master.opt
      mysql-test/suite/rpl/t/rpl_loaddatalocal.test:
        Rename: mysql-test/t/rpl_loaddatalocal.test -> mysql-test/suite/rpl/t/rpl_loaddatalocal.test
      mysql-test/suite/rpl/t/rpl_misc_functions.test:
        Rename: mysql-test/t/rpl_misc_functions.test -> mysql-test/suite/rpl/t/rpl_misc_functions.test
      mysql-test/suite/rpl/t/rpl_multi_update.test:
        Rename: mysql-test/t/rpl_multi_update.test -> mysql-test/suite/rpl/t/rpl_multi_update.test
      mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test:
        Rename: mysql-test/t/rpl_row_basic_11bugs.test -> mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test
      mysql-test/suite/rpl/t/rpl_row_blob_innodb-slave.opt:
        Rename: mysql-test/t/rpl_row_blob_innodb-slave.opt -> mysql-test/suite/rpl/t/rpl_row_blob_innodb-slave.opt
      mysql-test/suite/rpl/t/rpl_row_log-master.opt:
        Rename: mysql-test/t/rpl_row_log-master.opt -> mysql-test/suite/rpl/t/rpl_row_log-master.opt
      mysql-test/suite/rpl/t/rpl_row_sp001.test:
        Rename: mysql-test/t/rpl_row_sp001.test -> mysql-test/suite/rpl/t/rpl_row_sp001.test
      mysql-test/suite/rpl/t/rpl_row_sp002_innodb-master.opt:
        Rename: mysql-test/t/rpl_row_sp002_innodb-master.opt -> mysql-test/suite/rpl/t/rpl_row_sp002_innodb-master.opt
      mysql-test/suite/rpl/t/rpl_row_sp008.test:
        Rename: mysql-test/t/rpl_row_sp008.test -> mysql-test/suite/rpl/t/rpl_row_sp008.test
      mysql-test/suite/rpl/t/rpl_sp-slave.opt:
        Rename: mysql-test/t/rpl_sp-slave.opt -> mysql-test/suite/rpl/t/rpl_sp-slave.opt
      mysql-test/suite/rpl/t/rpl_stm_000001-slave.opt:
        Rename: mysql-test/t/rpl_stm_000001-slave.opt -> mysql-test/suite/rpl/t/rpl_stm_000001-slave.opt
      mysql-test/suite/rpl/t/rpl_timezone.test:
        Rename: mysql-test/t/rpl_timezone.test -> mysql-test/suite/rpl/t/rpl_timezone.test
      mysql-test/suite/rpl_ndb/r/rpl_ndb_2myisam.result:
        Rename: mysql-test/r/rpl_ndb_2myisam.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_2myisam.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_basic.result:
        Rename: mysql-test/r/rpl_ndb_basic.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_basic.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result:
        Rename: mysql-test/r/rpl_ndb_extraCol.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_idempotent.result:
        Rename: mysql-test/r/rpl_ndb_idempotent.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_idempotent.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result:
        Rename: mysql-test/r/rpl_ndb_log.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_row_001.result:
        Rename: mysql-test/r/rpl_ndb_row_001.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_row_001.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result:
        Rename: mysql-test/r/rpl_ndb_stm_innodb.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result
      mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb-slave.opt:
        Rename: mysql-test/t/rpl_ndb_2innodb-slave.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb-slave.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_blob.test:
        Rename: mysql-test/t/rpl_ndb_blob.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_blob.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_advance.test:
        Rename: mysql-test/t/rpl_ndb_dd_advance.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_advance.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb_trans-slave.opt:
        Rename: mysql-test/t/rpl_ndb_innodb_trans-slave.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb_trans-slave.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb-slave.opt:
        Rename: mysql-test/t/rpl_ndb_myisam2ndb-slave.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb-slave.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_rep_ignore.test:
        Rename: mysql-test/t/rpl_ndb_rep_ignore.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_rep_ignore.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb.test:
        Rename: mysql-test/t/rpl_ndb_stm_innodb.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb.test
      mysql-test/suite/rpl_ndb/t/rpl_ndbapi_multi.test:
        Rename: mysql-test/t/rpl_ndbapi_multi.test -> mysql-test/suite/rpl_ndb/t/rpl_ndbapi_multi.test
      mysql-test/suite/binlog/r/binlog_killed.result:
        Rename: mysql-test/r/binlog_killed.result -> mysql-test/suite/binlog/r/binlog_killed.result
      mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result:
        Rename: mysql-test/r/binlog_row_ctype_ucs.result -> mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result
      mysql-test/suite/binlog/r/binlog_stm_binlog.result:
        Rename: mysql-test/r/binlog_stm_binlog.result -> mysql-test/suite/binlog/r/binlog_stm_binlog.result
      mysql-test/suite/binlog/t/binlog_row_ctype_ucs.test:
        Rename: mysql-test/t/binlog_row_ctype_ucs.test -> mysql-test/suite/binlog/t/binlog_row_ctype_ucs.test
      mysql-test/suite/binlog/t/binlog_stm_innodb_stat.test:
        Rename: mysql-test/t/binlog_stm_innodb_stat.test -> mysql-test/suite/binlog/t/binlog_stm_innodb_stat.test
      mysql-test/suite/binlog/t/binlog_stm_ps.test:
        Rename: mysql-test/t/binlog_stm_ps.test -> mysql-test/suite/binlog/t/binlog_stm_ps.test
      mysql-test/suite/ndb/r/ndb_cache.result:
        Rename: mysql-test/r/ndb_cache.result -> mysql-test/suite/ndb/r/ndb_cache.result
      mysql-test/suite/ndb/r/ndb_charset.result:
        Rename: mysql-test/r/ndb_charset.result -> mysql-test/suite/ndb/r/ndb_charset.result
      mysql-test/suite/ndb/r/ndb_config.result:
        Rename: mysql-test/r/ndb_config.result -> mysql-test/suite/ndb/r/ndb_config.result
      mysql-test/suite/ndb/r/ndb_dd_disk2memory.result:
        Rename: mysql-test/r/ndb_dd_disk2memory.result -> mysql-test/suite/ndb/r/ndb_dd_disk2memory.result
      mysql-test/suite/ndb/r/ndb_index.result:
        Rename: mysql-test/r/ndb_index.result -> mysql-test/suite/ndb/r/ndb_index.result
      mysql-test/suite/ndb/r/ndb_partition_key.result:
        Rename: mysql-test/r/ndb_partition_key.result -> mysql-test/suite/ndb/r/ndb_partition_key.result
      mysql-test/suite/ndb/r/strict_autoinc_5ndb.result:
        Rename: mysql-test/r/strict_autoinc_5ndb.result -> mysql-test/suite/ndb/r/strict_autoinc_5ndb.result
      mysql-test/suite/ndb/t/ndb_backup_print.test:
        Rename: mysql-test/t/ndb_backup_print.test -> mysql-test/suite/ndb/t/ndb_backup_print.test
      mysql-test/suite/ndb/t/ndb_binlog_basic2.test:
        Rename: mysql-test/t/ndb_binlog_basic2.test -> mysql-test/suite/ndb/t/ndb_binlog_basic2.test
      mysql-test/suite/ndb/t/ndb_binlog_ignore_db.test:
        Rename: mysql-test/t/ndb_binlog_ignore_db.test -> mysql-test/suite/ndb/t/ndb_binlog_ignore_db.test
      mysql-test/suite/ndb/t/ndb_insert.test:
        Rename: mysql-test/t/ndb_insert.test -> mysql-test/suite/ndb/t/ndb_insert.test
      mysql-test/suite/ndb/t/ndb_load.test:
        Rename: mysql-test/t/ndb_load.test -> mysql-test/suite/ndb/t/ndb_load.test
      mysql-test/suite/ndb/t/ndb_multi.test:
        Rename: mysql-test/t/ndb_multi.test -> mysql-test/suite/ndb/t/ndb_multi.test
      mysql-test/suite/ndb/t/ndb_partition_error.test:
        Rename: mysql-test/t/ndb_partition_error.test -> mysql-test/suite/ndb/t/ndb_partition_error.test
      mysql-test/suite/ndb/t/ndb_partition_error2.test:
        Rename: mysql-test/t/ndb_partition_error2.test -> mysql-test/suite/ndb/t/ndb_partition_error2.test
      mysql-test/suite/ndb/t/ndb_partition_key.test:
        Rename: mysql-test/t/ndb_partition_key.test -> mysql-test/suite/ndb/t/ndb_partition_key.test
      mysql-test/suite/ndb/t/ndb_rename.test:
        Rename: mysql-test/t/ndb_rename.test -> mysql-test/suite/ndb/t/ndb_rename.test
      mysql-test/suite/ndb/t/ndb_single_user.test:
        Rename: mysql-test/t/ndb_single_user.test -> mysql-test/suite/ndb/t/ndb_single_user.test
      mysql-test/suite/rpl/r/rpl000010.result:
        Rename: mysql-test/r/rpl000010.result -> mysql-test/suite/rpl/r/rpl000010.result
      mysql-test/suite/rpl/r/rpl_EE_err.result:
        Rename: mysql-test/r/rpl_EE_err.result -> mysql-test/suite/rpl/r/rpl_EE_err.result
      mysql-test/suite/rpl/r/rpl_ddl.result:
        Rename: mysql-test/r/rpl_ddl.result -> mysql-test/suite/rpl/r/rpl_ddl.result
      mysql-test/suite/rpl/r/rpl_deadlock_innodb.result:
        Rename: mysql-test/r/rpl_deadlock_innodb.result -> mysql-test/suite/rpl/r/rpl_deadlock_innodb.result
      mysql-test/suite/rpl/r/rpl_drop.result:
        Rename: mysql-test/r/rpl_drop.result -> mysql-test/suite/rpl/r/rpl_drop.result
      mysql-test/suite/rpl/r/rpl_drop_temp.result:
        Rename: mysql-test/r/rpl_drop_temp.result -> mysql-test/suite/rpl/r/rpl_drop_temp.result
      mysql-test/suite/rpl/r/rpl_many_optimize.result:
        Rename: mysql-test/r/rpl_many_optimize.result -> mysql-test/suite/rpl/r/rpl_many_optimize.result
      mysql-test/suite/rpl/r/rpl_multi_engine.result:
        Rename: mysql-test/r/rpl_multi_engine.result -> mysql-test/suite/rpl/r/rpl_multi_engine.result
      mysql-test/suite/rpl/r/rpl_packet.result:
        Rename: mysql-test/r/rpl_packet.result -> mysql-test/suite/rpl/r/rpl_packet.result
      mysql-test/suite/rpl/r/rpl_relayrotate.result:
        Rename: mysql-test/r/rpl_relayrotate.result -> mysql-test/suite/rpl/r/rpl_relayrotate.result
      mysql-test/suite/rpl/r/rpl_row_basic_8partition.result:
        Rename: mysql-test/r/rpl_row_basic_8partition.result -> mysql-test/suite/rpl/r/rpl_row_basic_8partition.result
      mysql-test/suite/rpl/r/rpl_row_log.result:
        Rename: mysql-test/r/rpl_row_log.result -> mysql-test/suite/rpl/r/rpl_row_log.result
      mysql-test/suite/rpl/r/rpl_row_sp003.result:
        Rename: mysql-test/r/rpl_row_sp003.result -> mysql-test/suite/rpl/r/rpl_row_sp003.result
      mysql-test/suite/rpl/r/rpl_row_view01.result:
        Rename: mysql-test/r/rpl_row_view01.result -> mysql-test/suite/rpl/r/rpl_row_view01.result
      mysql-test/suite/rpl/r/rpl_session_var.result:
        Rename: mysql-test/r/rpl_session_var.result -> mysql-test/suite/rpl/r/rpl_session_var.result
      mysql-test/suite/rpl/r/rpl_sporadic_master.result:
        Rename: mysql-test/r/rpl_sporadic_master.result -> mysql-test/suite/rpl/r/rpl_sporadic_master.result
      mysql-test/suite/rpl/r/rpl_udf.result:
        Rename: mysql-test/r/rpl_udf.result -> mysql-test/suite/rpl/r/rpl_udf.result
      mysql-test/suite/rpl/r/rpl_variables.result:
        Rename: mysql-test/r/rpl_variables.result -> mysql-test/suite/rpl/r/rpl_variables.result
      mysql-test/suite/rpl/t/rpl_auto_increment-slave.opt:
        Rename: mysql-test/t/rpl_auto_increment-slave.opt -> mysql-test/suite/rpl/t/rpl_auto_increment-slave.opt
      mysql-test/suite/rpl/t/rpl_auto_increment.test:
        Rename: mysql-test/t/rpl_auto_increment.test -> mysql-test/suite/rpl/t/rpl_auto_increment.test
      mysql-test/suite/rpl/t/rpl_bit.test:
        Rename: mysql-test/t/rpl_bit.test -> mysql-test/suite/rpl/t/rpl_bit.test
      mysql-test/suite/rpl/t/rpl_critical_errors.test:
        Rename: mysql-test/t/rpl_critical_errors.test -> mysql-test/suite/rpl/t/rpl_critical_errors.test
      mysql-test/suite/rpl/t/rpl_ddl.test:
        Rename: mysql-test/t/rpl_ddl.test -> mysql-test/suite/rpl/t/rpl_ddl.test
      mysql-test/suite/rpl/t/rpl_do_grant.test:
        Rename: mysql-test/t/rpl_do_grant.test -> mysql-test/suite/rpl/t/rpl_do_grant.test
      mysql-test/suite/rpl/t/rpl_extraCol_innodb-slave.opt:
        Rename: mysql-test/t/rpl_extraCol_innodb-slave.opt -> mysql-test/suite/rpl/t/rpl_extraCol_innodb-slave.opt
      mysql-test/suite/rpl/t/rpl_ignore_revoke.test:
        Rename: mysql-test/t/rpl_ignore_revoke.test -> mysql-test/suite/rpl/t/rpl_ignore_revoke.test
      mysql-test/suite/rpl/t/rpl_init_slave-slave.opt:
        Rename: mysql-test/t/rpl_init_slave-slave.opt -> mysql-test/suite/rpl/t/rpl_init_slave-slave.opt
      mysql-test/suite/rpl/t/rpl_log_pos.test:
        Rename: mysql-test/t/rpl_log_pos.test -> mysql-test/suite/rpl/t/rpl_log_pos.test
      mysql-test/suite/rpl/t/rpl_multi_delete2-slave.opt:
        Rename: mysql-test/t/rpl_multi_delete2-slave.opt -> mysql-test/suite/rpl/t/rpl_multi_delete2-slave.opt
      mysql-test/suite/rpl/t/rpl_multi_update3.test:
        Rename: mysql-test/t/rpl_multi_update3.test -> mysql-test/suite/rpl/t/rpl_multi_update3.test
      mysql-test/suite/rpl/t/rpl_optimize.test:
        Rename: mysql-test/t/rpl_optimize.test -> mysql-test/suite/rpl/t/rpl_optimize.test
      mysql-test/suite/rpl/t/rpl_rbr_to_sbr.test:
        Rename: mysql-test/t/rpl_rbr_to_sbr.test -> mysql-test/suite/rpl/t/rpl_rbr_to_sbr.test
      mysql-test/suite/rpl/t/rpl_replicate_do-slave.opt:
        Rename: mysql-test/t/rpl_replicate_do-slave.opt -> mysql-test/suite/rpl/t/rpl_replicate_do-slave.opt
      mysql-test/suite/rpl/t/rpl_rewrt_db-slave.opt:
        Rename: mysql-test/t/rpl_rewrt_db-slave.opt -> mysql-test/suite/rpl/t/rpl_rewrt_db-slave.opt
      mysql-test/suite/rpl/t/rpl_rotate_logs-slave.sh:
        Rename: mysql-test/t/rpl_rotate_logs-slave.sh -> mysql-test/suite/rpl/t/rpl_rotate_logs-slave.sh
      mysql-test/suite/rpl/t/rpl_row_UUID.test:
        Rename: mysql-test/t/rpl_row_UUID.test -> mysql-test/suite/rpl/t/rpl_row_UUID.test
      mysql-test/suite/rpl/t/rpl_row_blob_innodb.test:
        Rename: mysql-test/t/rpl_row_blob_innodb.test -> mysql-test/suite/rpl/t/rpl_row_blob_innodb.test
      mysql-test/suite/rpl/t/rpl_row_create_table.test:
        Rename: mysql-test/t/rpl_row_create_table.test -> mysql-test/suite/rpl/t/rpl_row_create_table.test
      mysql-test/suite/rpl/t/rpl_row_func002.test:
        Rename: mysql-test/t/rpl_row_func002.test -> mysql-test/suite/rpl/t/rpl_row_func002.test
      mysql-test/suite/rpl/t/rpl_row_log.test:
        Rename: mysql-test/t/rpl_row_log.test -> mysql-test/suite/rpl/t/rpl_row_log.test
      mysql-test/suite/rpl/t/rpl_row_log_innodb-master.opt:
        Rename: mysql-test/t/rpl_row_log_innodb-master.opt -> mysql-test/suite/rpl/t/rpl_row_log_innodb-master.opt
      mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test:
        Rename: mysql-test/t/rpl_row_mysqlbinlog.test -> mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test
      mysql-test/suite/rpl/t/rpl_row_sp005.test:
        Rename: mysql-test/t/rpl_row_sp005.test -> mysql-test/suite/rpl/t/rpl_row_sp005.test
      mysql-test/suite/rpl/t/rpl_server_id2-slave.opt:
        Rename: mysql-test/t/rpl_server_id2-slave.opt -> mysql-test/suite/rpl/t/rpl_server_id2-slave.opt
      mysql-test/suite/rpl/t/rpl_sp.test:
        Rename: mysql-test/t/rpl_sp.test -> mysql-test/suite/rpl/t/rpl_sp.test
      mysql-test/suite/rpl/t/rpl_ssl.test:
        Rename: mysql-test/t/rpl_ssl.test -> mysql-test/suite/rpl/t/rpl_ssl.test
      mysql-test/suite/rpl/t/rpl_stm_EE_err2.test:
        Rename: mysql-test/t/rpl_stm_EE_err2.test -> mysql-test/suite/rpl/t/rpl_stm_EE_err2.test
      mysql-test/suite/rpl/t/rpl_stm_multi_query.test:
        Rename: mysql-test/t/rpl_stm_multi_query.test -> mysql-test/suite/rpl/t/rpl_stm_multi_query.test
      mysql-test/suite/rpl/t/rpl_udf-master.opt:
        Rename: mysql-test/t/rpl_udf-master.opt -> mysql-test/suite/rpl/t/rpl_udf-master.opt
      mysql-test/suite/rpl/t/rpl_udf.test:
        Rename: mysql-test/t/rpl_udf.test -> mysql-test/suite/rpl/t/rpl_udf.test
      mysql-test/suite/rpl/t/rpl_user_variables.test:
        Rename: mysql-test/t/rpl_user_variables.test -> mysql-test/suite/rpl/t/rpl_user_variables.test
      mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_basic.result:
        Rename: mysql-test/r/rpl_ndb_dd_basic.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_basic.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_ddl.result:
        Rename: mysql-test/r/rpl_ndb_ddl.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_ddl.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_do_table.result:
        Rename: mysql-test/r/rpl_ndb_do_table.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_do_table.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_func003.result:
        Rename: mysql-test/r/rpl_ndb_func003.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_func003.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_load.result:
        Rename: mysql-test/r/rpl_ndb_load.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_load.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_multi_update2.result:
        Rename: mysql-test/r/rpl_ndb_multi_update2.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_multi_update2.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_multi_update3.result:
        Rename: mysql-test/r/rpl_ndb_multi_update3.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_multi_update3.result
      mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result:
        Rename: mysql-test/r/rpl_row_basic_7ndb.result -> mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result
      mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam-master.opt:
        Rename: mysql-test/t/rpl_ndb_2myisam-master.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam-master.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_auto_inc.test:
        Rename: mysql-test/t/rpl_ndb_auto_inc.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_auto_inc.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_basic.test:
        Rename: mysql-test/t/rpl_ndb_basic.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_basic.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions.test:
        Rename: mysql-test/t/rpl_ndb_dd_partitions.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_log.test:
        Rename: mysql-test/t/rpl_ndb_log.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_log.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb-master.opt:
        Rename: mysql-test/t/rpl_ndb_myisam2ndb-master.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb-master.opt
      mysql-test/suite/rpl_ndb/t/rpl_row_basic_7ndb.test:
        Rename: mysql-test/t/rpl_row_basic_7ndb.test -> mysql-test/suite/rpl_ndb/t/rpl_row_basic_7ndb.test
      mysql-test/suite/binlog/r/binlog_row_drop_tmp_tbl.result:
        Rename: mysql-test/r/binlog_row_drop_tmp_tbl.result -> mysql-test/suite/binlog/r/binlog_row_drop_tmp_tbl.result
      mysql-test/suite/binlog/r/binlog_row_innodb_stat.result:
        Rename: mysql-test/r/binlog_row_innodb_stat.result -> mysql-test/suite/binlog/r/binlog_row_innodb_stat.result
      mysql-test/suite/binlog/t/binlog_killed.test:
        Rename: mysql-test/t/binlog_killed.test -> mysql-test/suite/binlog/t/binlog_killed.test
      mysql-test/suite/binlog/t/binlog_row_ctype_cp932.test:
        Rename: mysql-test/t/binlog_row_ctype_cp932.test -> mysql-test/suite/binlog/t/binlog_row_ctype_cp932.test
      mysql-test/suite/binlog/t/binlog_row_insert_select.test:
        Rename: mysql-test/t/binlog_row_insert_select.test -> mysql-test/suite/binlog/t/binlog_row_insert_select.test
      mysql-test/suite/ndb/r/ndb_alter_table.result:
        Rename: mysql-test/r/ndb_alter_table.result -> mysql-test/suite/ndb/r/ndb_alter_table.result
      mysql-test/suite/ndb/r/ndb_binlog_multi.result:
        Rename: mysql-test/r/ndb_binlog_multi.result -> mysql-test/suite/ndb/r/ndb_binlog_multi.result
      mysql-test/suite/ndb/r/ndb_cache2.result:
        Rename: mysql-test/r/ndb_cache2.result -> mysql-test/suite/ndb/r/ndb_cache2.result
      mysql-test/suite/ndb/r/ndb_database.result:
        Rename: mysql-test/r/ndb_database.result -> mysql-test/suite/ndb/r/ndb_database.result
      mysql-test/suite/ndb/r/ndb_grant.result:
        Rename: mysql-test/r/ndb_grant.result -> mysql-test/suite/ndb/r/ndb_grant.result
      mysql-test/suite/ndb/r/ndb_restore.result:
        Rename: mysql-test/r/ndb_restore.result -> mysql-test/suite/ndb/r/ndb_restore.result
      mysql-test/suite/ndb/r/ndb_restore_partition.result:
        Rename: mysql-test/r/ndb_restore_partition.result -> mysql-test/suite/ndb/r/ndb_restore_partition.result
      mysql-test/suite/ndb/r/ndbapi.result:
        Rename: mysql-test/r/ndbapi.result -> mysql-test/suite/ndb/r/ndbapi.result
      mysql-test/suite/ndb/t/ndb_autodiscover2-master.opt:
        Rename: mysql-test/t/ndb_autodiscover2-master.opt -> mysql-test/suite/ndb/t/ndb_autodiscover2-master.opt
      mysql-test/suite/ndb/t/ndb_autodiscover2.test:
        Rename: mysql-test/t/ndb_autodiscover2.test -> mysql-test/suite/ndb/t/ndb_autodiscover2.test
      mysql-test/suite/ndb/t/ndb_index.test:
        Rename: mysql-test/t/ndb_index.test -> mysql-test/suite/ndb/t/ndb_index.test
      mysql-test/suite/ndb/t/ndb_lock.test:
        Rename: mysql-test/t/ndb_lock.test -> mysql-test/suite/ndb/t/ndb_lock.test
      mysql-test/suite/ndb/t/ndb_restore_compat.test:
        Rename: mysql-test/t/ndb_restore_compat.test -> mysql-test/suite/ndb/t/ndb_restore_compat.test
      mysql-test/suite/ndb/t/ndb_sp.test:
        Rename: mysql-test/t/ndb_sp.test -> mysql-test/suite/ndb/t/ndb_sp.test
      mysql-test/suite/ndb/t/ndb_subquery.test:
        Rename: mysql-test/t/ndb_subquery.test -> mysql-test/suite/ndb/t/ndb_subquery.test
      mysql-test/suite/ndb/t/ndb_temporary.test:
        Rename: mysql-test/t/ndb_temporary.test -> mysql-test/suite/ndb/t/ndb_temporary.test
      mysql-test/suite/rpl/r/rpl_LD_INFILE.result:
        Rename: mysql-test/r/rpl_LD_INFILE.result -> mysql-test/suite/rpl/r/rpl_LD_INFILE.result
      mysql-test/suite/rpl/r/rpl_auto_increment.result:
        Rename: mysql-test/r/rpl_auto_increment.result -> mysql-test/suite/rpl/r/rpl_auto_increment.result
      mysql-test/suite/rpl/r/rpl_create_database.result:
        Rename: mysql-test/r/rpl_create_database.result -> mysql-test/suite/rpl/r/rpl_create_database.result
      mysql-test/suite/rpl/r/rpl_critical_errors.result.txt:
        Rename: mysql-test/r/rpl_critical_errors.result.txt -> mysql-test/suite/rpl/r/rpl_critical_errors.result.txt
      mysql-test/suite/rpl/r/rpl_empty_master_crash.result:
        Rename: mysql-test/r/rpl_empty_master_crash.result -> mysql-test/suite/rpl/r/rpl_empty_master_crash.result
      mysql-test/suite/rpl/r/rpl_flushlog_loop.result:
        Rename: mysql-test/r/rpl_flushlog_loop.result -> mysql-test/suite/rpl/r/rpl_flushlog_loop.result
      mysql-test/suite/rpl/r/rpl_ignore_table.result:
        Rename: mysql-test/r/rpl_ignore_table.result -> mysql-test/suite/rpl/r/rpl_ignore_table.result
      mysql-test/suite/rpl/r/rpl_load_table_from_master.result:
        Rename: mysql-test/r/rpl_load_table_from_master.result -> mysql-test/suite/rpl/r/rpl_load_table_from_master.result
      mysql-test/suite/rpl/r/rpl_loaddata_simple.result:
        Rename: mysql-test/r/rpl_loaddata_simple.result -> mysql-test/suite/rpl/r/rpl_loaddata_simple.result
      mysql-test/suite/rpl/r/rpl_loaddatalocal.result:
        Rename: mysql-test/r/rpl_loaddatalocal.result -> mysql-test/suite/rpl/r/rpl_loaddatalocal.result
      mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result:
        Rename: mysql-test/r/rpl_rbr_to_sbr.result -> mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result
      mysql-test/suite/rpl/r/rpl_relay_space_myisam.result:
        Rename: mysql-test/r/rpl_relay_space_myisam.result -> mysql-test/suite/rpl/r/rpl_relay_space_myisam.result
      mysql-test/suite/rpl/r/rpl_rotate_logs.result:
        Rename: mysql-test/r/rpl_rotate_logs.result -> mysql-test/suite/rpl/r/rpl_rotate_logs.result
      mysql-test/suite/rpl/r/rpl_row_001.result:
        Rename: mysql-test/r/rpl_row_001.result -> mysql-test/suite/rpl/r/rpl_row_001.result
      mysql-test/suite/rpl/r/rpl_row_basic_11bugs-master.opt:
        Rename: mysql-test/r/rpl_row_basic_11bugs-master.opt -> mysql-test/suite/rpl/r/rpl_row_basic_11bugs-master.opt
      mysql-test/suite/rpl/r/rpl_row_basic_11bugs-slave.opt:
        Rename: mysql-test/r/rpl_row_basic_11bugs-slave.opt -> mysql-test/suite/rpl/r/rpl_row_basic_11bugs-slave.opt
      mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result:
        Rename: mysql-test/r/rpl_row_basic_3innodb.result -> mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result
      mysql-test/suite/rpl/r/rpl_row_delayed_ins.result:
        Rename: mysql-test/r/rpl_row_delayed_ins.result -> mysql-test/suite/rpl/r/rpl_row_delayed_ins.result
      mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result:
        Rename: mysql-test/r/rpl_row_mysqlbinlog.result -> mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result
      mysql-test/suite/rpl/r/rpl_row_mystery22.result:
        Rename: mysql-test/r/rpl_row_mystery22.result -> mysql-test/suite/rpl/r/rpl_row_mystery22.result
      mysql-test/suite/rpl/r/rpl_row_reset_slave.result:
        Rename: mysql-test/r/rpl_row_reset_slave.result -> mysql-test/suite/rpl/r/rpl_row_reset_slave.result
      mysql-test/suite/rpl/r/rpl_row_sp005.result:
        Rename: mysql-test/r/rpl_row_sp005.result -> mysql-test/suite/rpl/r/rpl_row_sp005.result
      mysql-test/suite/rpl/r/rpl_row_tabledefs_7ndb.result:
        Rename: mysql-test/r/rpl_row_tabledefs_7ndb.result -> mysql-test/suite/rpl/r/rpl_row_tabledefs_7ndb.result
      mysql-test/suite/rpl/r/rpl_server_id2.result:
        Rename: mysql-test/r/rpl_server_id2.result -> mysql-test/suite/rpl/r/rpl_server_id2.result
      mysql-test/suite/rpl/r/rpl_sp.result:
        Rename: mysql-test/r/rpl_sp.result -> mysql-test/suite/rpl/r/rpl_sp.result
      mysql-test/suite/rpl/r/rpl_temporary.result:
        Rename: mysql-test/r/rpl_temporary.result -> mysql-test/suite/rpl/r/rpl_temporary.result
      mysql-test/suite/rpl/r/rpl_trunc_temp.result:
        Rename: mysql-test/r/rpl_trunc_temp.result -> mysql-test/suite/rpl/r/rpl_trunc_temp.result
      mysql-test/suite/rpl/r/rpl_truncate_7ndb_2.result:
        Rename: mysql-test/r/rpl_truncate_7ndb_2.result -> mysql-test/suite/rpl/r/rpl_truncate_7ndb_2.result
      mysql-test/suite/rpl/r/rpl_user_variables.result:
        Rename: mysql-test/r/rpl_user_variables.result -> mysql-test/suite/rpl/r/rpl_user_variables.result
      mysql-test/suite/rpl/t/rpl000010-slave.opt:
        Rename: mysql-test/t/rpl000010-slave.opt -> mysql-test/suite/rpl/t/rpl000010-slave.opt
      mysql-test/suite/rpl/t/rpl_alter.test:
        Rename: mysql-test/t/rpl_alter.test -> mysql-test/suite/rpl/t/rpl_alter.test
      mysql-test/suite/rpl/t/rpl_deadlock_innodb.test:
        Rename: mysql-test/t/rpl_deadlock_innodb.test -> mysql-test/suite/rpl/t/rpl_deadlock_innodb.test
      mysql-test/suite/rpl/t/rpl_events.test:
        Rename: mysql-test/t/rpl_events.test -> mysql-test/suite/rpl/t/rpl_events.test
      mysql-test/suite/rpl/t/rpl_ignore_revoke-slave.opt:
        Rename: mysql-test/t/rpl_ignore_revoke-slave.opt -> mysql-test/suite/rpl/t/rpl_ignore_revoke-slave.opt
      mysql-test/suite/rpl/t/rpl_ignore_table-slave.opt:
        Rename: mysql-test/t/rpl_ignore_table-slave.opt -> mysql-test/suite/rpl/t/rpl_ignore_table-slave.opt
      mysql-test/suite/rpl/t/rpl_insert.test:
        Rename: mysql-test/t/rpl_insert.test -> mysql-test/suite/rpl/t/rpl_insert.test
      mysql-test/suite/rpl/t/rpl_insert_id.test:
        Rename: mysql-test/t/rpl_insert_id.test -> mysql-test/suite/rpl/t/rpl_insert_id.test
      mysql-test/suite/rpl/t/rpl_insert_id_pk.test:
        Rename: mysql-test/t/rpl_insert_id_pk.test -> mysql-test/suite/rpl/t/rpl_insert_id_pk.test
      mysql-test/suite/rpl/t/rpl_insert_ignore.test:
        Rename: mysql-test/t/rpl_insert_ignore.test -> mysql-test/suite/rpl/t/rpl_insert_ignore.test
      mysql-test/suite/rpl/t/rpl_loaddata_charset.test:
        Rename: mysql-test/t/rpl_loaddata_charset.test -> mysql-test/suite/rpl/t/rpl_loaddata_charset.test
      mysql-test/suite/rpl/t/rpl_loaddata_simple.test:
        Rename: mysql-test/t/rpl_loaddata_simple.test -> mysql-test/suite/rpl/t/rpl_loaddata_simple.test
      mysql-test/suite/rpl/t/rpl_multi_delete2.test:
        Rename: mysql-test/t/rpl_multi_delete2.test -> mysql-test/suite/rpl/t/rpl_multi_delete2.test
      mysql-test/suite/rpl/t/rpl_multi_engine-slave.opt:
        Rename: mysql-test/t/rpl_multi_engine-slave.opt -> mysql-test/suite/rpl/t/rpl_multi_engine-slave.opt
      mysql-test/suite/rpl/t/rpl_read_only-slave.opt:
        Rename: mysql-test/t/rpl_read_only-slave.opt -> mysql-test/suite/rpl/t/rpl_read_only-slave.opt
      mysql-test/suite/rpl/t/rpl_relayrotate-slave.opt:
        Rename: mysql-test/t/rpl_relayrotate-slave.opt -> mysql-test/suite/rpl/t/rpl_relayrotate-slave.opt
      mysql-test/suite/rpl/t/rpl_replicate_do.test:
        Rename: mysql-test/t/rpl_replicate_do.test -> mysql-test/suite/rpl/t/rpl_replicate_do.test
      mysql-test/suite/rpl/t/rpl_replicate_ignore_db-slave.opt:
        Rename: mysql-test/t/rpl_replicate_ignore_db-slave.opt -> mysql-test/suite/rpl/t/rpl_replicate_ignore_db-slave.opt
      mysql-test/suite/rpl/t/rpl_row_001.test:
        Rename: mysql-test/t/rpl_row_001.test -> mysql-test/suite/rpl/t/rpl_row_001.test
      mysql-test/suite/rpl/t/rpl_row_basic_2myisam.test:
        Rename: mysql-test/t/rpl_row_basic_2myisam.test -> mysql-test/suite/rpl/t/rpl_row_basic_2myisam.test
      mysql-test/suite/rpl/t/rpl_row_basic_3innodb-slave.opt:
        Rename: mysql-test/t/rpl_row_basic_3innodb-slave.opt -> mysql-test/suite/rpl/t/rpl_row_basic_3innodb-slave.opt
      mysql-test/suite/rpl/t/rpl_row_basic_8partition.test:
        Rename: mysql-test/t/rpl_row_basic_8partition.test -> mysql-test/suite/rpl/t/rpl_row_basic_8partition.test
      mysql-test/suite/rpl/t/rpl_row_charset.test:
        Rename: mysql-test/t/rpl_row_charset.test -> mysql-test/suite/rpl/t/rpl_row_charset.test
      mysql-test/suite/rpl/t/rpl_row_drop.test:
        Rename: mysql-test/t/rpl_row_drop.test -> mysql-test/suite/rpl/t/rpl_row_drop.test
      mysql-test/suite/rpl/t/rpl_row_trig004.test:
        Rename: mysql-test/t/rpl_row_trig004.test -> mysql-test/suite/rpl/t/rpl_row_trig004.test
      mysql-test/suite/rpl/t/rpl_row_view01.test:
        Rename: mysql-test/t/rpl_row_view01.test -> mysql-test/suite/rpl/t/rpl_row_view01.test
      mysql-test/suite/rpl/t/rpl_sp_effects-master.opt:
        Rename: mysql-test/t/rpl_sp_effects-master.opt -> mysql-test/suite/rpl/t/rpl_sp_effects-master.opt
      mysql-test/suite/rpl/t/rpl_stm_charset.test:
        Rename: mysql-test/t/rpl_stm_charset.test -> mysql-test/suite/rpl/t/rpl_stm_charset.test
      mysql-test/suite/rpl/t/rpl_stm_log-slave.opt:
        Rename: mysql-test/t/rpl_stm_log-slave.opt -> mysql-test/suite/rpl/t/rpl_stm_log-slave.opt
      mysql-test/suite/rpl/t/rpl_truncate_7ndb_2-master.opt:
        Rename: mysql-test/t/rpl_truncate_7ndb_2-master.opt -> mysql-test/suite/rpl/t/rpl_truncate_7ndb_2-master.opt
      mysql-test/suite/rpl/t/rpl_variables-master.opt:
        Rename: mysql-test/t/rpl_variables-master.opt -> mysql-test/suite/rpl/t/rpl_variables-master.opt
      mysql-test/suite/rpl/t/rpl_view-slave.opt:
        Rename: mysql-test/t/rpl_view-slave.opt -> mysql-test/suite/rpl/t/rpl_view-slave.opt
      mysql-test/suite/rpl/t/rpl_view.test:
        Rename: mysql-test/t/rpl_view.test -> mysql-test/suite/rpl/t/rpl_view.test
      mysql-test/suite/rpl_ndb/r/rpl_ndb_charset.result:
        Rename: mysql-test/r/rpl_ndb_charset.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_charset.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result:
        Rename: mysql-test/r/rpl_ndb_circular_simplex.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_advance.result:
        Rename: mysql-test/r/rpl_ndb_dd_advance.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_advance.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_trig004.result:
        Rename: mysql-test/r/rpl_ndb_trig004.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_trig004.result
      mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb-master.opt:
        Rename: mysql-test/t/rpl_ndb_2innodb-master.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb-master.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_UUID.test:
        Rename: mysql-test/t/rpl_ndb_UUID.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_UUID.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test:
        Rename: mysql-test/t/rpl_ndb_circular_simplex.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_extraCol.test:
        Rename: mysql-test/t/rpl_ndb_extraCol.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_extraCol.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb-master.opt:
        Rename: mysql-test/t/rpl_ndb_stm_innodb-master.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb-master.opt
      mysql-test/suite/binlog/t/binlog_row_binlog.test:
        Rename: mysql-test/t/binlog_row_binlog.test -> mysql-test/suite/binlog/t/binlog_row_binlog.test
      mysql-test/suite/ndb/r/ndb_autodiscover.result:
        Rename: mysql-test/r/ndb_autodiscover.result -> mysql-test/suite/ndb/r/ndb_autodiscover.result
      mysql-test/suite/ndb/r/ndb_binlog_ignore_db.result:
        Rename: mysql-test/r/ndb_binlog_ignore_db.result -> mysql-test/suite/ndb/r/ndb_binlog_ignore_db.result
      mysql-test/suite/ndb/r/ndb_cache_multi.result:
        Rename: mysql-test/r/ndb_cache_multi.result -> mysql-test/suite/ndb/r/ndb_cache_multi.result
      mysql-test/suite/ndb/r/ndb_partition_error.result:
        Rename: mysql-test/r/ndb_partition_error.result -> mysql-test/suite/ndb/r/ndb_partition_error.result
      mysql-test/suite/ndb/r/ndb_read_multi_range.result:
        Rename: mysql-test/r/ndb_read_multi_range.result -> mysql-test/suite/ndb/r/ndb_read_multi_range.result
      mysql-test/suite/ndb/r/ndb_truncate.result:
        Rename: mysql-test/r/ndb_truncate.result -> mysql-test/suite/ndb/r/ndb_truncate.result
      mysql-test/suite/ndb/t/ndb_gis.test:
        Rename: mysql-test/t/ndb_gis.test -> mysql-test/suite/ndb/t/ndb_gis.test
      mysql-test/suite/ndb/t/ndb_grant.later:
        Rename: mysql-test/t/ndb_grant.later -> mysql-test/suite/ndb/t/ndb_grant.later
      mysql-test/suite/rpl/r/rpl_err_ignoredtable.result:
        Rename: mysql-test/r/rpl_err_ignoredtable.result -> mysql-test/suite/rpl/r/rpl_err_ignoredtable.result
      mysql-test/suite/rpl/r/rpl_ignore_grant.result:
        Rename: mysql-test/r/rpl_ignore_grant.result -> mysql-test/suite/rpl/r/rpl_ignore_grant.result
      mysql-test/suite/rpl/r/rpl_load_from_master.result:
        Rename: mysql-test/r/rpl_load_from_master.result -> mysql-test/suite/rpl/r/rpl_load_from_master.result
      mysql-test/suite/rpl/r/rpl_master_pos_wait.result:
        Rename: mysql-test/r/rpl_master_pos_wait.result -> mysql-test/suite/rpl/r/rpl_master_pos_wait.result
      mysql-test/suite/rpl/r/rpl_misc_functions.result:
        Rename: mysql-test/r/rpl_misc_functions.result -> mysql-test/suite/rpl/r/rpl_misc_functions.result
      mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result:
        Rename: mysql-test/r/rpl_row_basic_11bugs.result -> mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result
      mysql-test/suite/rpl/r/rpl_row_max_relay_size.result:
        Rename: mysql-test/r/rpl_row_max_relay_size.result -> mysql-test/suite/rpl/r/rpl_row_max_relay_size.result
      mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
        Rename: mysql-test/r/rpl_row_tabledefs_2myisam.result -> mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result
      mysql-test/suite/rpl/r/rpl_server_id1.result:
        Rename: mysql-test/r/rpl_server_id1.result -> mysql-test/suite/rpl/r/rpl_server_id1.result
      mysql-test/suite/rpl/r/rpl_sf.result:
        Rename: mysql-test/r/rpl_sf.result -> mysql-test/suite/rpl/r/rpl_sf.result
      mysql-test/suite/rpl/r/rpl_start_stop_slave.result:
        Rename: mysql-test/r/rpl_start_stop_slave.result -> mysql-test/suite/rpl/r/rpl_start_stop_slave.result
      mysql-test/suite/rpl/r/rpl_stm_reset_slave.result:
        Rename: mysql-test/r/rpl_stm_reset_slave.result -> mysql-test/suite/rpl/r/rpl_stm_reset_slave.result
      mysql-test/suite/rpl/r/rpl_stm_until.result:
        Rename: mysql-test/r/rpl_stm_until.result -> mysql-test/suite/rpl/r/rpl_stm_until.result
      mysql-test/suite/rpl/t/rpl_000015-slave.sh:
        Rename: mysql-test/t/rpl_000015-slave.sh -> mysql-test/suite/rpl/t/rpl_000015-slave.sh
      mysql-test/suite/rpl/t/rpl_change_master.test:
        Rename: mysql-test/t/rpl_change_master.test -> mysql-test/suite/rpl/t/rpl_change_master.test
      mysql-test/suite/rpl/t/rpl_drop_temp-slave.opt:
        Rename: mysql-test/t/rpl_drop_temp-slave.opt -> mysql-test/suite/rpl/t/rpl_drop_temp-slave.opt
      mysql-test/suite/rpl/t/rpl_multi_engine.test:
        Rename: mysql-test/t/rpl_multi_engine.test -> mysql-test/suite/rpl/t/rpl_multi_engine.test
      mysql-test/suite/rpl/t/rpl_relayspace-slave.opt:
        Rename: mysql-test/t/rpl_relayspace-slave.opt -> mysql-test/suite/rpl/t/rpl_relayspace-slave.opt
      mysql-test/suite/rpl/t/rpl_row_blob_myisam.test:
        Rename: mysql-test/t/rpl_row_blob_myisam.test -> mysql-test/suite/rpl/t/rpl_row_blob_myisam.test
      mysql-test/suite/rpl/t/rpl_row_sp009.test:
        Rename: mysql-test/t/rpl_row_sp009.test -> mysql-test/suite/rpl/t/rpl_row_sp009.test
      mysql-test/suite/rpl/t/rpl_row_sp010.test:
        Rename: mysql-test/t/rpl_row_sp010.test -> mysql-test/suite/rpl/t/rpl_row_sp010.test
      mysql-test/suite/rpl/t/rpl_stm_insert_delayed.test:
        Rename: mysql-test/t/rpl_stm_insert_delayed.test -> mysql-test/suite/rpl/t/rpl_stm_insert_delayed.test
      mysql-test/suite/rpl/t/rpl_stm_until.test:
        Rename: mysql-test/t/rpl_stm_until.test -> mysql-test/suite/rpl/t/rpl_stm_until.test
      mysql-test/suite/rpl/t/rpl_truncate_3innodb.test:
        Rename: mysql-test/t/rpl_truncate_3innodb.test -> mysql-test/suite/rpl/t/rpl_truncate_3innodb.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_bank.test:
        Rename: mysql-test/t/rpl_ndb_bank.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_bank.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_row_001.test:
        Rename: mysql-test/t/rpl_ndb_row_001.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_row_001.test
      mysql-test/lib/mtr_cases.pl:
        Reorganize collect function to collect from more than one suite
        Add new function collect_one_suite
        Set name of test to <suite>.<testname>
      mysql-test/lib/mtr_report.pl:
        Determine name of files from "result_file" name
      mysql-test/mysql-test-run.pl:
        Collect tests from suites main, binlog, rpl, rpl_ndb and ndb as default.
        Add --suites as a synonym of --suite and allow a semicolon separated
        list of suite names to be passed to it.
        Determine name of files to cleanup from "result_file" name
        Update usage
        Add possibility to add a suite.opt file
      mysql-test/t/disabled.def:
        Move disabled testcases to their respective suite
      mysql-test/suite/funcs_1/t/suite.opt:
        New BitKeeper file ``mysql-test/suite/funcs_1/t/suite.opt''
      mysql-test/suite/funcs_2/t/suite.opt:
        New BitKeeper file ``mysql-test/suite/funcs_2/t/suite.opt''
      mysql-test/suite/ndb/t/disabled.def:
        New BitKeeper file ``mysql-test/suite/ndb/t/disabled.def''
      mysql-test/suite/rpl/t/disabled.def:
        New BitKeeper file ``mysql-test/suite/rpl/t/disabled.def''
      mysql-test/suite/rpl_ndb/t/disabled.def:
        New BitKeeper file ``mysql-test/suite/rpl_ndb/t/disabled.def''
      a40e44ef
  15. 11 Jun, 2007 1 commit
    • unknown's avatar
      BUG#24954 (Last_errno and Last_error not set after master_retry_count has · abbf5941
      unknown authored
      been reached):
      
      Post-merge patch to handle all the changes to the tree since the tree
      was cloned.
      
      
      mysql-test/extra/rpl_tests/rpl_log.test:
        Replacing SHOW SLAVE STATUS with include file.
      mysql-test/extra/rpl_tests/rpl_max_relay_size.test:
        Replacing SHOW SLAVE STATUS with include file.
      mysql-test/extra/rpl_tests/rpl_reset_slave.test:
        Replacing SHOW SLAVE STATUS with include file.
      mysql-test/include/show_slave_status.inc:
        Column change.
      mysql-test/r/rpl_000015.result:
        Result file change.
      mysql-test/r/rpl_change_master.result:
        Result file change.
      mysql-test/r/rpl_empty_master_crash.result:
        Result file change.
      mysql-test/r/rpl_extraCol_innodb.result:
        Result file change.
      mysql-test/r/rpl_extraCol_myisam.result:
        Result file change.
      mysql-test/r/rpl_flushlog_loop.result:
        Result file change.
      mysql-test/r/rpl_incident.result:
        Result file change.
      mysql-test/r/rpl_known_bugs_detection.result:
        Result file change.
      mysql-test/r/rpl_loaddata.result:
        Result file change.
      mysql-test/r/rpl_loaddata_fatal.result:
        Result file change.
      mysql-test/r/rpl_log_pos.result:
        Result file change.
      mysql-test/r/rpl_ndb_basic.result:
        Result file change.
      mysql-test/r/rpl_ndb_circular.result:
        Result file change.
      mysql-test/r/rpl_ndb_extraCol.result:
        Result file change.
      mysql-test/r/rpl_ndb_idempotent.result:
        Result file change.
      mysql-test/r/rpl_ndb_log.result:
        Result file change.
      mysql-test/r/rpl_ndb_sync.result:
        Result file change.
      mysql-test/r/rpl_rbr_to_sbr.result:
        Result file change.
      mysql-test/r/rpl_redirect.result:
        Result file change.
      mysql-test/r/rpl_replicate_do.result:
        Result file change.
      mysql-test/r/rpl_rotate_logs.result:
        Result file change.
      mysql-test/r/rpl_row_inexist_tbl.result:
        Result file change.
      mysql-test/r/rpl_row_log.result:
        Result file change.
      mysql-test/r/rpl_row_log_innodb.result:
        Result file change.
      mysql-test/r/rpl_row_max_relay_size.result:
        Result file change.
      mysql-test/r/rpl_row_reset_slave.result:
        Result file change.
      mysql-test/r/rpl_row_tabledefs_2myisam.result:
        Result file change.
      mysql-test/r/rpl_row_tabledefs_3innodb.result:
        Result file change.
      mysql-test/r/rpl_row_until.result:
        Result file change.
      mysql-test/r/rpl_server_id1.result:
        Result file change.
      mysql-test/r/rpl_server_id2.result:
        Result file change.
      mysql-test/r/rpl_slave_skip.result:
        Result file change.
      mysql-test/r/rpl_ssl.result:
        Result file change.
      mysql-test/r/rpl_ssl1.result:
        Result file change.
      mysql-test/r/rpl_stm_log.result:
        Result file change.
      mysql-test/r/rpl_stm_max_relay_size.result:
        Result file change.
      mysql-test/r/rpl_stm_reset_slave.result:
        Result file change.
      mysql-test/r/rpl_stm_until.result:
        Result file change.
      mysql-test/t/rpl_000015.test:
        Replacing SHOW SLAVE STATUS with include file.
      mysql-test/t/rpl_change_master.test:
        Column position change.
        Making result of SHOW SLAVE STATUS vertical.
      mysql-test/t/rpl_empty_master_crash.test:
        Replacing SHOW SLAVE STATUS with include file.
      mysql-test/t/rpl_log_pos.test:
        Replacing SHOW SLAVE STATUS with include file.
      mysql-test/t/rpl_ndb_basic.test:
        Column position change.
      mysql-test/t/rpl_ndb_idempotent.test:
        Column position change.
      mysql-test/t/rpl_ndb_sync.test:
        Column position change.
        Making result of SHOW SLAVE STATUS vertical.
      mysql-test/t/rpl_redirect.test:
        Replacing SHOW SLAVE STATUS with include file.
      mysql-test/t/rpl_replicate_do.test:
        Column position change.
        Making result of SHOW SLAVE STATUS vertical.
      mysql-test/t/rpl_rotate_logs.test:
        Replacing SHOW SLAVE STATUS with include file.
      mysql-test/t/rpl_row_inexist_tbl.test:
        Replacing SHOW SLAVE STATUS with include file.
      mysql-test/t/rpl_row_until.test:
        Replacing SHOW SLAVE STATUS with include file.
      mysql-test/t/rpl_server_id1.test:
        Column position change.
        Making result of SHOW SLAVE STATUS vertical.
      mysql-test/t/rpl_server_id2.test:
        Column position change.
        Making result of SHOW SLAVE STATUS vertical.
      mysql-test/t/rpl_slave_status.test:
        Column position change.
      mysql-test/t/rpl_ssl.test:
        Column position change.
      mysql-test/t/rpl_ssl1.test:
        Column position change.
      mysql-test/t/rpl_stm_until.test:
        Replacing SHOW SLAVE STATUS with include file.
      sql/log_event.cc:
        Using member function last_error() instead of member variable.
        Replacing use of 'table' with 'm_table'.
        Suppressing warnings in debug printout.
        Setting thd->net.last_error on error return from unpack_row() to get
        a non-zero error message.  The error codes for are being harmonized
        in another worklog.
        Replacing use of slave_print_msg() with RELAY_LOG_INFO::report().
      sql/rpl_mi.h:
        Moving order of include files since they are dependent (!).
      sql/rpl_record.cc:
        Adding missing include file.
        Replacing use of slave_print_msg() with RELAY_LOG_INFO::report().
      sql/rpl_record_old.cc:
        Adding missing include file.
        Replacing use of slave_print_msg() with RELAY_LOG_INFO::report().
      sql/rpl_reporting.cc:
        Adding const modifier to member function.
        Using renamed member variable m_last_error.
      sql/rpl_reporting.h:
        Adding missing constant MAX_SLAVE_ERRMSG.
        Adding const modifier to Slave_reporting_capability::report().
        Hiding and renaming member variable last_error and incorporating
        member function for access in order to make it mutable.
      sql/rpl_rli.h:
        Moving constant MAX_SLAVE_ERRMSG.
      sql/rpl_utility.cc:
        Adding missing include file rpl_rli.h.
      sql/slave.cc:
        Replacing use of member variable last_error with call to member function
        last_error().
        Replacing use of slave_print_msg() with RELAY_LOG_INFO::report().
      abbf5941
  16. 09 Jun, 2007 1 commit
    • unknown's avatar
      BUG#24954 (Last_errno and Last_error not set after master_retry_count was reached): · 79a609aa
      unknown authored
      Adding new fields Last_{IO,SQL}_Errno and Last_{IO,SQL}_Error to output
      of SHOW SLAVE STATUS to hold errors from I/O and SQL thread respectively.
      Old fields Last_Error and Last_Errno are aliases for Last_SQL_Error and
      Last_SQL_Errno respectively.
      
      Fields are added last to output of SHOW SLAVE STATUS to allow old applications
      to use the same positional arguments into the row, while allowing new
      application to benefit from the added information.
      
      In addition, some new error codes are added (especially for the I/O
      thread) to be able to provide sensible error message.
      
      
      mysql-test/extra/rpl_tests/rpl_max_relay_size.test:
        Commenting out irrelevant fields Last_IO_Error and Last_IO_Errno
      mysql-test/r/binlog_row_mix_innodb_myisam.result:
        Result change
      mysql-test/r/rpl_000015.result:
        Result change
      mysql-test/r/rpl_change_master.result:
        Result change
      mysql-test/r/rpl_deadlock_innodb.result:
        Result change
      mysql-test/r/rpl_empty_master_crash.result:
        Result change
      mysql-test/r/rpl_extraCol_innodb.result:
        Result change
        ---
        Result change.
      mysql-test/r/rpl_extraCol_myisam.result:
        Result change
        ---
        Result change.
      mysql-test/r/rpl_flushlog_loop.result:
        Result change
      mysql-test/r/rpl_loaddata.result:
        Result change
      mysql-test/r/rpl_log_pos.result:
        Result change
      mysql-test/r/rpl_ndb_basic.result:
        Result change
      mysql-test/r/rpl_ndb_extraCol.result:
        Result change
        ---
        Result change.
      mysql-test/r/rpl_ndb_idempotent.result:
        Result change
      mysql-test/r/rpl_ndb_log.result:
        Result change
      mysql-test/r/rpl_openssl.result:
        Result change
      mysql-test/r/rpl_rbr_to_sbr.result:
        Result change
      mysql-test/r/rpl_redirect.result:
        Result change
      mysql-test/r/rpl_replicate_do.result:
        Result change
      mysql-test/r/rpl_rotate_logs.result:
        Result change
      mysql-test/r/rpl_row_inexist_tbl.result:
        Result change
      mysql-test/r/rpl_row_log.result:
        Result change
      mysql-test/r/rpl_row_log_innodb.result:
        Result change
      mysql-test/r/rpl_row_max_relay_size.result:
        Result change
      mysql-test/r/rpl_row_reset_slave.result:
        Result change
      mysql-test/r/rpl_row_tabledefs_2myisam.result:
        Result change
        ---
        Result change.
      mysql-test/r/rpl_row_tabledefs_3innodb.result:
        Result change
        ---
        Result change.
      mysql-test/r/rpl_row_until.result:
        Result change
      mysql-test/r/rpl_server_id1.result:
        Result change
      mysql-test/r/rpl_server_id2.result:
        Result change
      mysql-test/r/rpl_slave_status.result:
        Result change
      mysql-test/r/rpl_stm_log.result:
        Result change
      mysql-test/r/rpl_stm_max_relay_size.result:
        Result change
        ---
        Result change.
      mysql-test/r/rpl_stm_reset_slave.result:
        Result change
      mysql-test/r/rpl_stm_until.result:
        Result change
      mysql-test/t/binlog_row_mix_innodb_myisam.test:
        Test fixed.
      mysql-test/t/rpl_000015.test:
        Commenting out irrelevant fields Last_IO_Error and Last_IO_Errno
      mysql-test/t/rpl_change_master.test:
        Commenting out irrelevant fields Last_IO_Error and Last_IO_Errno
      mysql-test/t/rpl_empty_master_crash.test:
        Commenting out irrelevant fields Last_IO_Error and Last_IO_Errno
      mysql-test/t/rpl_flushlog_loop.test:
        Commenting out irrelevant fields Last_IO_Error and Last_IO_Errno
      mysql-test/t/rpl_log_pos.test:
        Commenting out irrelevant fields Last_IO_Error and Last_IO_Errno
      mysql-test/t/rpl_ndb_bank.test:
        Commenting out irrelevant fields Last_IO_Error and Last_IO_Errno
      mysql-test/t/rpl_ndb_basic.test:
        Commenting out irrelevant fields Last_IO_Error and Last_IO_Errno
      mysql-test/t/rpl_ndb_idempotent.test:
        Commenting out irrelevant fields Last_IO_Error and Last_IO_Errno
      mysql-test/t/rpl_ndb_sync.test:
        Commenting out irrelevant fields Last_IO_Error and Last_IO_Errno
      mysql-test/t/rpl_openssl.test:
        Commenting out irrelevant fields Last_IO_Error and Last_IO_Errno
      mysql-test/t/rpl_rbr_to_sbr.test:
        Commenting out irrelevant fields Last_IO_Error and Last_IO_Errno
      mysql-test/t/rpl_redirect.test:
        Commenting out irrelevant fields Last_IO_Error and Last_IO_Errno
      mysql-test/t/rpl_replicate_do.test:
        Commenting out irrelevant fields Last_IO_Error and Last_IO_Errno
      mysql-test/t/rpl_rotate_logs.test:
        Commenting out irrelevant fields Last_IO_Error and Last_IO_Errno
      mysql-test/t/rpl_row_inexist_tbl.test:
        Commenting out irrelevant fields Last_IO_Error and Last_IO_Errno
      mysql-test/t/rpl_row_until.test:
        Commenting out irrelevant fields Last_IO_Error and Last_IO_Errno
      mysql-test/t/rpl_server_id1.test:
        Commenting out irrelevant fields Last_IO_Error and Last_IO_Errno
      mysql-test/t/rpl_server_id2.test:
        Commenting out irrelevant fields Last_IO_Error and Last_IO_Errno
      mysql-test/t/rpl_slave_status.test:
        Commenting out irrelevant fields Last_IO_Error and Last_IO_Errno
      mysql-test/t/rpl_stm_until.test:
        Commenting out irrelevant fields Last_IO_Error and Last_IO_Errno
      sql/Makefile.am:
        Adding new files
      sql/log_event.cc:
        Changes to use Slave_reporting_capability for reporting errors.
        
        Adding debug variable to stop slave with an out-of-memory error or with
        a fatal error. The checks are put both in the new Execute_load_query_
        log_event and in the old Load_log_event which is used for Execute_load_
        log_event.
        
        Adding code to generate fatal error message.
        
        Eliminating redundant arguments when printing ER_NO_DEFAULT_FOR_FIELD
        message.
      sql/rpl_mi.cc:
        Using Slave_reporting_capability for error reporting.
      sql/rpl_mi.h:
        Using Slave_reporting_capability to handle I/O thread errors and other messages.
      sql/rpl_rli.cc:
        Using Slave_reporting_capability to handle SQL thread errors and other messages.
      sql/rpl_rli.h:
        Changes to use Slave_reporting_capability for reporting SQL thread error and other messages.
      sql/rpl_utility.cc:
        Changes to use Slave_reporting_capability for reporting errors.
      sql/slave.cc:
        Changes to use Slave_reporting_capability for reporting errors.
      sql/slave.h:
        Removing slave_print_msg()
      sql/share/errmsg.txt:
        New error messages.
        
        Making message for ER_NO_DEFAULT_FOR_FIELD consistent over languages
        (actually restoring old message).
        
        Adding argument to ER_SLAVE_FATAL_ERROR message.
      sql/sql_repl.cc:
        Using new names for thread masks.
      mysql-test/t/rpl_loaddata_fatal-slave.opt:
        New BitKeeper file ``mysql-test/t/rpl_loaddata_fatal-slave.opt''
      sql/rpl_reporting.cc:
        New BitKeeper file ``sql/rpl_reporting.cc''
      sql/rpl_reporting.h:
        New BitKeeper file ``sql/rpl_reporting.h''
      mysql-test/include/show_slave_status.inc:
        New BitKeeper file ``mysql-test/include/show_slave_status.inc''
      mysql-test/r/rpl_loaddata_fatal.result:
        New BitKeeper file ``mysql-test/r/rpl_loaddata_fatal.result''
      mysql-test/t/rpl_loaddata_fatal.test:
        New BitKeeper file ``mysql-test/t/rpl_loaddata_fatal.test''
      79a609aa
  17. 30 Mar, 2007 2 commits
    • unknown's avatar
      - Fixing binary log positions · 5a7b2fc7
      unknown authored
      - Eliminating some compiler warnings
      
      
      mysql-test/extra/binlog_tests/blackhole.test:
        Using include file for SHOW BINLOG EVENTS.
      mysql-test/extra/binlog_tests/drop_temp_table.test:
        Using include file for SHOW BINLOG EVENTS.
      mysql-test/extra/binlog_tests/insert_select-binlog.test:
        Using include file for SHOW BINLOG EVENTS.
      mysql-test/extra/rpl_tests/rpl_log.test:
        Using include file for SHOW BINLOG EVENTS.
      mysql-test/extra/rpl_tests/rpl_row_delayed_ins.test:
        Using include file for SHOW BINLOG EVENTS.
      mysql-test/extra/rpl_tests/rpl_truncate_helper.test:
        Using include file for SHOW BINLOG EVENTS.
      mysql-test/include/show_binlog_events.inc:
        Fixing regex replace to handle XIDs as well.
      mysql-test/r/binlog_row_binlog.result:
        Result change
      mysql-test/r/binlog_row_blackhole.result:
        Result change
      mysql-test/r/binlog_row_ctype_ucs.result:
        Result change
      mysql-test/r/binlog_row_drop_tmp_tbl.result:
        Result change
      mysql-test/r/binlog_row_insert_select.result:
        Result change
      mysql-test/r/binlog_row_mix_innodb_myisam.result:
        Result change
      mysql-test/r/binlog_stm_binlog.result:
        Result change
      mysql-test/r/binlog_stm_blackhole.result:
        Result change
      mysql-test/r/binlog_stm_drop_tmp_tbl.result:
        Result change
      mysql-test/r/binlog_stm_insert_select.result:
        Result change
      mysql-test/r/binlog_stm_mix_innodb_myisam.result:
        Result change
      mysql-test/r/ctype_cp932_binlog_row.result:
        Result change
      mysql-test/r/rpl_ndb_charset.result:
        Result change
      mysql-test/r/rpl_ndb_log.result:
        Result change
      mysql-test/r/rpl_ndb_multi.result:
        Result change
      mysql-test/r/rpl_row_basic_11bugs.result:
        Result change
      mysql-test/r/rpl_row_charset.result:
        Result change
      mysql-test/r/rpl_row_create_table.result:
        Result change
      mysql-test/r/rpl_row_delayed_ins.result:
        Result change
      mysql-test/r/rpl_row_drop.result:
        Result change
      mysql-test/r/rpl_row_flsh_tbls.result:
        Result change
      mysql-test/r/rpl_row_inexist_tbl.result:
        Result change
      mysql-test/r/rpl_row_log.result:
        Result change
      mysql-test/r/rpl_row_log_innodb.result:
        Result change
      mysql-test/r/rpl_row_reset_slave.result:
        Result change
      mysql-test/r/rpl_row_until.result:
        Result change
      mysql-test/r/rpl_stm_log.result:
        Result change
      mysql-test/r/rpl_truncate_2myisam.result:
        Result change
      mysql-test/r/rpl_truncate_3innodb.result:
        Result change
      mysql-test/r/rpl_udf.result:
        Result change
      mysql-test/t/binlog_row_mix_innodb_myisam.test:
        Fixing binary log position
      mysql-test/t/binlog_stm_mix_innodb_myisam.test:
        Fixing binary log position.
      sql/log_event.cc:
        Eliminating compiler warnings.
      5a7b2fc7
    • unknown's avatar
      Post merge fixes of result files. · c4bab45b
      unknown authored
      mysql-test/r/binlog_stm_binlog.result:
        Result change.
      mysql-test/r/binlog_stm_ctype_ucs.result:
        Result change.
      mysql-test/r/binlog_stm_insert_select.result:
        Result change.
      mysql-test/r/ctype_cp932_binlog_stm.result:
        Result change.
      mysql-test/r/flush_block_commit_notembedded.result:
        Result change.
      mysql-test/r/rpl_000015.result:
        Result change.
      mysql-test/r/rpl_change_master.result:
        Result change.
      mysql-test/r/rpl_deadlock_innodb.result:
        Result change.
      mysql-test/r/rpl_flushlog_loop.result:
        Result change.
      mysql-test/r/rpl_known_bugs_detection.result:
        Result change.
      mysql-test/r/rpl_loaddata.result:
        Result change.
      mysql-test/r/rpl_loaddata_s.result:
        Result change.
      mysql-test/r/rpl_log_pos.result:
        Result change.
      mysql-test/r/rpl_rbr_to_sbr.result:
        Result change.
      mysql-test/r/rpl_rotate_logs.result:
        Result change.
      mysql-test/r/rpl_row_max_relay_size.result:
        Result change.
      mysql-test/r/rpl_server_id1.result:
        Result change.
      mysql-test/r/rpl_server_id2.result:
        Result change.
      mysql-test/r/rpl_sp.result:
        Result change.
      mysql-test/r/rpl_stm_charset.result:
        Result change.
      mysql-test/r/rpl_stm_flsh_tbls.result:
        Result change.
      mysql-test/r/rpl_stm_log.result:
        Result change.
      mysql-test/r/rpl_stm_max_relay_size.result:
        Result change.
      mysql-test/r/rpl_stm_multi_query.result:
        Result change.
      mysql-test/r/rpl_stm_reset_slave.result:
        Result change.
      mysql-test/r/rpl_stm_until.result:
        Result change.
      mysql-test/r/rpl_switch_stm_row_mixed.result:
        Result change.
      mysql-test/r/rpl_truncate_2myisam.result:
        Result change.
      mysql-test/r/rpl_truncate_3innodb.result:
        Result change.
      mysql-test/r/rpl_truncate_7ndb.result:
        Result change.
      mysql-test/r/user_var-binlog.result:
        Result change.
      c4bab45b
  18. 29 Mar, 2007 2 commits
    • unknown's avatar
      WL#3464: Add replication event to denote gap in replication · adaf162b
      unknown authored
      Adding an event that can be used to denote that an incident occured
      on the master. The event can be used to denote a gap in the replication
      stream, but can also be used to denote other incidents.
      
      In addition, the injector interface is extended with functions to
      generate an incident event. The function will also rotate the binary
      log after generating an incident event to get a fresh binary log.
      
      
      client/Makefile.am:
        Adding file rpl_constants.h with constants for replication.
      mysql-test/extra/binlog_tests/binlog.test:
        Binlog position change
      mysql-test/extra/binlog_tests/binlog_insert_delayed.test:
        Binlog position change
      mysql-test/extra/binlog_tests/ctype_cp932_binlog.test:
        Binlog position change
      mysql-test/extra/binlog_tests/ctype_ucs_binlog.test:
        Binlog position change
      mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
        Binlog position change
      mysql-test/extra/rpl_tests/rpl_deadlock.test:
        Binlog position change
      mysql-test/extra/rpl_tests/rpl_log.test:
        Binlog position change
      mysql-test/extra/rpl_tests/rpl_multi_query.test:
        Binlog position change
      mysql-test/extra/rpl_tests/rpl_row_charset.test:
        Binlog position change
      mysql-test/extra/rpl_tests/rpl_row_sp002.test:
        Binlog position change
      mysql-test/extra/rpl_tests/rpl_row_sp003.test:
        Binlog position change
      mysql-test/extra/rpl_tests/rpl_stm_charset.test:
        Binlog position change
      mysql-test/include/show_binlog_events.inc:
        Binlog position change
      mysql-test/r/binlog_row_binlog.result:
        Result change
      mysql-test/r/binlog_row_ctype_ucs.result:
        Result change
      mysql-test/r/binlog_row_insert_select.result:
        Result change
      mysql-test/r/binlog_row_mix_innodb_myisam.result:
        Result change
      mysql-test/r/binlog_stm_binlog.result:
        Result change
      mysql-test/r/binlog_stm_ctype_ucs.result:
        Result change
      mysql-test/r/binlog_stm_insert_select.result:
        Result change
      mysql-test/r/binlog_stm_mix_innodb_myisam.result:
        Result change
      mysql-test/r/ctype_cp932_binlog_row.result:
        Result change
      mysql-test/r/ctype_cp932_binlog_stm.result:
        Result change
      mysql-test/r/flush_block_commit_notembedded.result:
        Result change
      mysql-test/r/rpl_000015.result:
        Result change
      mysql-test/r/rpl_change_master.result:
        Result change
      mysql-test/r/rpl_deadlock_innodb.result:
        Result change
      mysql-test/r/rpl_flushlog_loop.result:
        Result change
      mysql-test/r/rpl_loaddata.result:
        Result change
      mysql-test/r/rpl_loaddata_s.result:
        Result change
      mysql-test/r/rpl_log_pos.result:
        Result change
      mysql-test/r/rpl_ndb_charset.result:
        Result change
      mysql-test/r/rpl_ndb_log.result:
        Result change
      mysql-test/r/rpl_ndb_multi.result:
        Result change
      mysql-test/r/rpl_rbr_to_sbr.result:
        Result change
      mysql-test/r/rpl_rotate_logs.result:
        Result change
      mysql-test/r/rpl_row_basic_11bugs.result:
        Result change
      mysql-test/r/rpl_row_charset.result:
        Result change
      mysql-test/r/rpl_row_create_table.result:
        Result change
      mysql-test/r/rpl_row_delayed_ins.result:
        Result change
      mysql-test/r/rpl_row_drop.result:
        Result change
      mysql-test/r/rpl_row_flsh_tbls.result:
        Result change
      mysql-test/r/rpl_row_inexist_tbl.result:
        Result change
      mysql-test/r/rpl_row_log.result:
        Result change
      mysql-test/r/rpl_row_log_innodb.result:
        Result change
      mysql-test/r/rpl_row_max_relay_size.result:
        Result change
      mysql-test/r/rpl_row_reset_slave.result:
        Result change
      mysql-test/r/rpl_row_until.result:
        Result change
      mysql-test/r/rpl_server_id1.result:
        Result change
      mysql-test/r/rpl_server_id2.result:
        Result change
      mysql-test/r/rpl_sp.result:
        Result change
      mysql-test/r/rpl_stm_charset.result:
        Result change
      mysql-test/r/rpl_stm_flsh_tbls.result:
        Result change
      mysql-test/r/rpl_stm_log.result:
        Result change
      mysql-test/r/rpl_stm_max_relay_size.result:
        Result change
      mysql-test/r/rpl_stm_multi_query.result:
        Result change
      mysql-test/r/rpl_stm_reset_slave.result:
        Result change
      mysql-test/r/rpl_stm_until.result:
        Result change
      mysql-test/r/rpl_switch_stm_row_mixed.result:
        Result change
      mysql-test/r/rpl_truncate_2myisam.result:
        Result change
      mysql-test/r/rpl_truncate_3innodb.result:
        Result change
      mysql-test/r/rpl_truncate_7ndb.result:
        Result change
      mysql-test/r/user_var-binlog.result:
        Result change
      mysql-test/t/binlog_row_mix_innodb_myisam.test:
        Binlog position change
      mysql-test/t/binlog_stm_mix_innodb_myisam.test:
        Binlog position change
      mysql-test/t/ctype_cp932_binlog_stm.test:
        Binlog position change
      mysql-test/t/mysqlbinlog.test:
        Binlog position change
      mysql-test/t/mysqlbinlog2.test:
        Binlog position change
      mysql-test/t/rpl_loaddata_s.test:
        Binlog position change
      mysql-test/t/rpl_log_pos.test:
        Binlog position change
      mysql-test/t/rpl_row_basic_11bugs.test:
        Binlog position change
      mysql-test/t/rpl_row_create_table.test:
        Binlog position change
      mysql-test/t/rpl_row_flsh_tbls.test:
        Binlog position change
      mysql-test/t/rpl_row_mysqlbinlog.test:
        Binlog position change
      mysql-test/t/rpl_sp.test:
        Binlog position change
      mysql-test/t/rpl_stm_flsh_tbls.test:
        Binlog position change
      mysql-test/t/rpl_switch_stm_row_mixed.test:
        Binlog position change
      mysql-test/t/user_var-binlog.test:
        Binlog position change
      sql/Makefile.am:
        Adding file rpl_constants.h with constants for replication.
      sql/log_event.cc:
        Changing prototype for read_str() to be const-correct and changing code to match that.
        Adding incident log event.
      sql/log_event.h:
        Adding incident log event.
      sql/rpl_injector.cc:
        Adding support for generating incidents into the binary log.
      sql/rpl_injector.h:
        Adding support for generating incidents into the binary log.
      sql/share/errmsg.txt:
        Adding new error message to indicate an incident.
      sql/sql_parse.cc:
        Adding code to generate an incident log event just before executing a REPLACE
        if the variable "incident_database_resync_on_replace" is set.
      mysql-test/r/rpl_incident.result:
        New BitKeeper file ``mysql-test/r/rpl_incident.result''
      mysql-test/t/rpl_incident.test:
        New BitKeeper file ``mysql-test/t/rpl_incident.test''
      sql/rpl_constants.h:
        New BitKeeper file ``sql/rpl_constants.h''
      adaf162b
    • unknown's avatar
      Bug#19991 CHANGE MASTER need option ssl-verify-server-cert · d6422f61
      unknown authored
       - Add MASTER_SSL_VERIFY_SERVER_CERT option to CHANGE MASTER TO
       - Add Master_Ssl_Serify_Server_Cert to SHOW SLAVE STATUS
       - Save and restore ssl_verify_server_cert  to master info file
         setting it to disabled as default.
      
      
      mysql-test/r/rpl_000015.result:
        Update test result after adding new column to SHOW SLAVE STATUS
      mysql-test/r/rpl_change_master.result:
        Update test result after adding new column to SHOW SLAVE STATUS
      mysql-test/r/rpl_empty_master_crash.result:
        Update test result after adding new column to SHOW SLAVE STATUS
      mysql-test/r/rpl_flushlog_loop.result:
        Update test result after adding new column to SHOW SLAVE STATUS
      mysql-test/r/rpl_loaddata.result:
        Update test result after adding new column to SHOW SLAVE STATUS
      mysql-test/r/rpl_log_pos.result:
        Update test result after adding new column to SHOW SLAVE STATUS
      mysql-test/r/rpl_rbr_to_sbr.result:
        Update test result after adding new column to SHOW SLAVE STATUS
      mysql-test/r/rpl_redirect.result:
        Update test result after adding new column to SHOW SLAVE STATUS
      mysql-test/r/rpl_replicate_do.result:
        Update test result after adding new column to SHOW SLAVE STATUS
      mysql-test/r/rpl_rotate_logs.result:
        Update test result after adding new column to SHOW SLAVE STATUS
      mysql-test/r/rpl_row_max_relay_size.result:
        Update test result after adding new column to SHOW SLAVE STATUS
      mysql-test/r/rpl_server_id1.result:
        Update test result after adding new column to SHOW SLAVE STATUS
      mysql-test/r/rpl_server_id2.result:
        Update test result after adding new column to SHOW SLAVE STATUS
      mysql-test/r/rpl_slave_status.result:
        Update test result after adding new column to SHOW SLAVE STATUS
      mysql-test/r/rpl_ssl1.result:
        Update test result after adding new column to SHOW SLAVE STATUS
      mysql-test/r/rpl_stm_log.result:
        Update test result after adding new column to SHOW SLAVE STATUS
      mysql-test/r/rpl_stm_max_relay_size.result:
        Update test result after adding new column to SHOW SLAVE STATUS
      mysql-test/r/rpl_stm_reset_slave.result:
        Update test result after adding new column to SHOW SLAVE STATUS
      mysql-test/r/rpl_stm_until.result:
        Update test result after adding new column to SHOW SLAVE STATUS
      mysql-test/t/rpl_ssl1.test:
        Change to "query_vertical show slave status"
      sql/lex.h:
        Add new token for MASTER_SSL_VERIFY_SERVER_CERT
      sql/repl_failsafe.cc:
        Turn on verification of master cert if so requested
      sql/rpl_mi.cc:
        Add new variable to MASTER_INFo and save/restore it from/to line 15 of master info
        file
      sql/rpl_mi.h:
        Add variable for ssl_verify_server_cert to MASTER_INFO
      sql/slave.cc:
        Turn on verification of master cert if so requested
        Add new column to SHOW  SLAVE STATUS
      sql/sql_lex.h:
        Add ssl_verify_server_cert to "st_lex_master_info" struct - allow
        it to be UNCHANGED just like the ssl option.
      sql/sql_repl.cc:
        Add ssl_verify_server_cert to "st_lex_master_info" struct - allow
        it to be UNCHANGED just like the ssl option.
      sql/sql_yacc.yy:
        Add MASTER_SSL_VERIFY_SERVER_CERT to CHANGE MASTER TO
      mysql-test/t/rpl_ssl_verify_server.test:
        New BitKeeper file ``mysql-test/t/rpl_ssl_verify_server.test''
      mysql-test/r/rpl_ssl_verify_server.result:
        New BitKeeper file ``mysql-test/r/rpl_ssl_verify_server.result''
      d6422f61
  19. 20 Mar, 2007 1 commit
    • unknown's avatar
      BUG#22583: RBR between MyISAM and non-MyISAM tables containing a BIT · a0e0166b
      unknown authored
                 field does not work
      
      Fix to prevent MyISAM from reading data from NULL BLOB.
      Fix to make record comparison independent of values of unused bits in
      record.
      Updating binlog positions in tests.
      
      
      mysql-test/extra/rpl_tests/rpl_multi_query.test:
        Binlog position change
      mysql-test/extra/rpl_tests/rpl_stm_charset.test:
        Binlog position change
      mysql-test/include/show_binlog_events.inc:
        Binlog position change
      mysql-test/r/binlog_stm_binlog.result:
        Result change
      mysql-test/r/binlog_stm_ctype_ucs.result:
        Result change
      mysql-test/r/binlog_stm_insert_select.result:
        Result change
      mysql-test/r/binlog_stm_mix_innodb_myisam.result:
        Result change
      mysql-test/r/ctype_cp932_binlog_stm.result:
        Result change
      mysql-test/r/ndb_binlog_multi.result:
        Result change
      mysql-test/r/rpl_known_bugs_detection.result:
        Result change
      mysql-test/r/rpl_loaddata.result:
        Result change
      mysql-test/r/rpl_loaddata_s.result:
        Result change
      mysql-test/r/rpl_ndb_charset.result:
        Result change
      mysql-test/r/rpl_ndb_extraCol.result:
        Result change
      mysql-test/r/rpl_ndb_log.result:
        Result change
      mysql-test/r/rpl_ndb_multi.result:
        Result change
      mysql-test/r/rpl_rbr_to_sbr.result:
        Result change
      mysql-test/r/rpl_rotate_logs.result:
        Result change
      mysql-test/r/rpl_sp.result:
        Result change
      mysql-test/r/rpl_stm_charset.result:
        Result change
      mysql-test/r/rpl_stm_flsh_tbls.result:
        Result change
      mysql-test/r/rpl_stm_log.result:
        Result change
      mysql-test/r/rpl_stm_max_relay_size.result:
        Result change
      mysql-test/r/rpl_stm_multi_query.result:
        Result change
      mysql-test/r/rpl_stm_reset_slave.result:
        Result change
      mysql-test/r/rpl_stm_until.result:
        Result change
      mysql-test/r/rpl_truncate_7ndb.result:
        Result change
      mysql-test/r/user_var-binlog.result:
        Result change
      mysql-test/t/binlog_stm_mix_innodb_myisam.test:
        Binlog position change
      mysql-test/t/ctype_cp932_binlog_stm.test:
        Binlog position change
      mysql-test/t/mysqlbinlog.test:
        Binlog position change
      mysql-test/t/mysqlbinlog2.test:
        Binlog position change
      mysql-test/t/rpl_sp.test:
        Binlog position change
      mysql-test/t/rpl_stm_flsh_tbls.test:
        Binlog position change
      sql/log_event.cc:
        Emptying the record entirely since it appears MyISAM reads blob column
        data even when they are NULL.
        
        Adding code to set unused bits of the records before doing a comparison,
        and restoring the original values after. Setting the unused bits is necessary
        since NDB does not set them correctly, and resetting them afterwards is needed
        because MyISAM compares the record with the one located when updating
        or deleting it.
      mysql-test/r/rpl_row_basic_11bugs-master.opt:
        New BitKeeper file ``mysql-test/r/rpl_row_basic_11bugs-master.opt''
      mysql-test/r/rpl_row_basic_11bugs-slave.opt:
        New BitKeeper file ``mysql-test/r/rpl_row_basic_11bugs-slave.opt''
      a0e0166b
  20. 01 Mar, 2007 1 commit
    • unknown's avatar
      Switch back to master before cleanup of the created tables · 708d0d72
      unknown authored
      That causes test case for bug#6880 to be run on the master
      instead of the slave and thus the result files need to be updated
      
      
      mysql-test/r/rpl_ndb_log.result:
        Update result, test is now run on master
      mysql-test/r/rpl_row_log.result:
        Update result, test is now run on master
      mysql-test/r/rpl_row_log_innodb.result:
        Update result, test is now run on master
      mysql-test/r/rpl_stm_log.result:
        Update result, test is now run on master
      708d0d72
  21. 19 Jun, 2006 1 commit
    • unknown's avatar
      rpl_log.test, rpl_stm_log.result: · 9f8c532f
      unknown authored
        Fixed failing test case
      field.cc, item_cmpfunc.cc, select.result:
        After merge fix
      
      
      mysql-test/r/select.result:
        After merge fix
      mysql-test/r/rpl_stm_log.result:
        Fixed failing test case
      sql/item_cmpfunc.cc:
        After merge fix
      sql/field.cc:
        After merge fix
      mysql-test/extra/rpl_tests/rpl_log.test:
        Fixed failing test case
      9f8c532f
  22. 16 May, 2006 1 commit
    • unknown's avatar
      Updated to fix bug in AIX · fdedc069
      unknown authored
      mysql-test/extra/rpl_tests/rpl_log.test:
        Remove disable log per lars
      mysql-test/r/rpl_stm_log.result:
        New results file
      mysql-test/r/rpl_row_log.result:
        New results file
      mysql-test/r/rpl_row_log_innodb.result:
        New results file
      fdedc069
  23. 16 Feb, 2006 1 commit
    • unknown's avatar
      Test case · bd5e7cef
      unknown authored
      mysql-test/r/rpl_stm_log.result:
        Fixing test case
      bd5e7cef
  24. 08 Feb, 2006 1 commit
    • unknown's avatar
      rpl_stm_log.result: · 3ec1dcae
      unknown authored
        Fixed bug in test case
      
      
      mysql-test/r/rpl_stm_log.result:
        Fixed bug in test case
      3ec1dcae
  25. 26 Jan, 2006 1 commit
    • unknown's avatar
      Update 5.1 to use MYSQLTEST_VARDIR · 484f5696
      unknown authored
      mysql-test/extra/rpl_tests/rpl_loaddata.test:
        Update to use std_data_ln
      mysql-test/mysql-test-run.pl:
        Add back variable path_mysqltest_log
      mysql-test/r/rpl_loaddata.result:
        Binlog offset changed when using std_data_ln instead of std_data
      mysql-test/r/rpl_stm_log.result:
        Binlog offset changed when using std_data_ln instead of std_data
      484f5696
  26. 22 Dec, 2005 1 commit
    • unknown's avatar
      WL#1012: All changes as one single changeset. · 09346e6e
      unknown authored
      This includes both code and test cases.
      
      
      BitKeeper/deleted/.del-ctype_ucs_binlog.result~280d136b1a0bcf17:
        Delete: mysql-test/r/ctype_ucs_binlog.result
      BitKeeper/deleted/.del-rpl_delete_all.result~7c050d592614b3f:
        Delete: mysql-test/r/rpl_delete_all.result
      BitKeeper/deleted/.del-rpl000013-slave.opt~18266ad8a2403e8d:
        Delete: mysql-test/t/rpl000013-slave.opt
      BitKeeper/deleted/.del-rpl_delete_all.test~700a1490277780e0:
        Delete: mysql-test/t/rpl_delete_all.test
      mysql-test/extra/binlog_tests/binlog.test:
        Import patch wl1012.patch
      mysql-test/extra/binlog_tests/blackhole.test:
        Import patch wl1012.patch
      mysql-test/extra/binlog_tests/ctype_cp932.test:
        Import patch wl1012.patch
      mysql-test/extra/binlog_tests/ctype_cp932_binlog.test:
        Import patch wl1012.patch
      mysql-test/extra/binlog_tests/ctype_ucs_binlog.test:
        Import patch wl1012.patch
      mysql-test/extra/binlog_tests/drop_temp_table.test:
        Import patch wl1012.patch
      mysql-test/extra/binlog_tests/insert_select-binlog.test:
        Import patch wl1012.patch
      mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_ddl.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_deadlock.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_err_ignoredtable.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_flsh_tbls.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_loaddata_m.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_log.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_max_relay_size.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_multi_query.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_reset_slave.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_stm_000001.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_stm_EE_err.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_stm_charset.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_user_variables.test:
        Import patch wl1012.patch
      mysql-test/r/binlog_stm_binlog.result:
        Import patch wl1012.patch
      mysql-test/r/binlog_stm_blackhole.result:
        Import patch wl1012.patch
      mysql-test/r/binlog_stm_ctype_cp932.result:
        Import patch wl1012.patch
      mysql-test/r/binlog_stm_ctype_ucs.result:
        Import patch wl1012.patch
      mysql-test/r/binlog_stm_drop_tmp_tbl.result:
        Import patch wl1012.patch
      mysql-test/r/binlog_stm_insert_select.result:
        Import patch wl1012.patch
      mysql-test/r/binlog_stm_mix_innodb_myisam.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_000012.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_000015.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_deadlock_innodb.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_flushlog_loop.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_loaddata_s.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_000001.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_EE_err.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_charset.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_ddl.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_err_ignoredtable.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_flsh_tbls.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_loaddata_m.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_log.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_max_relay_size.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_multi_query.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_mystery22.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_reset_slave.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_rewrt_db.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_sp.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_timezone.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_until.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_user_variables.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_view.result:
        Import patch wl1012.patch
      mysql-test/t/binlog_row_binlog-master.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_000012.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_000015-slave.sh:
        Import patch wl1012.patch
      mysql-test/t/rpl_000015.slave-mi:
        Import patch wl1012.patch
      mysql-test/t/rpl_000015.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_deadlock_innodb-slave.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_flushlog_loop-master.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_flushlog_loop-master.sh:
        Import patch wl1012.patch
      mysql-test/t/rpl_flushlog_loop-slave.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_flushlog_loop-slave.sh:
        Import patch wl1012.patch
      mysql-test/t/rpl_flushlog_loop.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_loaddata_s-slave.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_loaddata_s.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_000001-slave.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_err_ignoredtable-slave.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_loaddata_m-master.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_log-master.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_log-slave.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_mystery22.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_rewrt_db-slave.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_rewrt_db.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_sp-master.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_sp-slave.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_sp.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_timezone-master.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_timezone-slave.opt:
        Import patch wl1012.patch
      BUILD/SETUP.sh:
        Import patch wl1012.patch
      Makefile.am:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_timezone.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_until.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_view.test:
        Import patch wl1012.patch
      client/Makefile.am:
        Import patch wl1012.patch
      client/client_priv.h:
        Import patch wl1012.patch
      client/mysqlbinlog.cc:
        Import patch wl1012.patch
      configure.in:
        Import patch wl1012.patch
      include/Makefile.am:
        Import patch wl1012.patch
      include/base64.h:
        Import patch wl1012.patch
      include/config-win.h:
        Import patch wl1012.patch
      include/my_base.h:
        Import patch wl1012.patch
      include/my_global.h:
        Import patch wl1012.patch
      mysql-test/Makefile.am:
        Import patch wl1012.patch
      mysql-test/mysql-test-run.pl:
        Import patch wl1012.patch
      mysql-test/mysql-test-run.sh:
        Import patch wl1012.patch
      mysql-test/r/date_formats.result:
        Import patch wl1012.patch
      mysql-test/r/flush_block_commit.result:
        Import patch wl1012.patch
      mysql-test/r/innodb.result:
        Import patch wl1012.patch
      mysql-test/r/rpl000017.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_change_master.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_commit_after_flush.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_create_database.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_do_grant.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_loaddata.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_log_pos.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_multi_delete.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_multi_update.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_openssl.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_replicate_do.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_rotate_logs.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_server_id1.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_server_id2.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_temporary.result:
        Import patch wl1012.patch
      mysql-test/r/user_var-binlog.result:
        Import patch wl1012.patch
      mysql-test/t/create_select_tmp.test:
        Import patch wl1012.patch
      mysql-test/t/date_formats.test:
        Import patch wl1012.patch
      mysql-test/t/disabled.def:
        Import patch wl1012.patch
      mysql-test/t/innodb.test:
        Import patch wl1012.patch
      mysql-test/t/mysqlbinlog.test:
        Import patch wl1012.patch
      mysql-test/t/mysqlbinlog2.test:
        Import patch wl1012.patch
      mysql-test/t/rpl000002.test:
        Import patch wl1012.patch
      mysql-test/t/rpl000006.test:
        Import patch wl1012.patch
      mysql-test/t/rpl000013.test:
        Import patch wl1012.patch
      mysql-test/t/rpl000017.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_auto_increment.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_change_master.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_commit_after_flush.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_create_database.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_do_grant.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_drop.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_empty_master_crash.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_failed_optimize.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_heap.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_insert_id.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_insert_ignore.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_loaddata.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_log_pos.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_multi_delete.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_multi_update.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_multi_update2.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_multi_update3.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_openssl.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_redirect.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_relayrotate.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_replicate_do.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_rotate_logs.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_server_id1.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_sp_effects.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_temporary.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_trigger.test:
        Import patch wl1012.patch
      mysql-test/t/sp.test:
        Import patch wl1012.patch
      mysql-test/t/user_var-binlog.test:
        Import patch wl1012.patch
      mysys/Makefile.am:
        Import patch wl1012.patch
      mysys/base64.c:
        Import patch wl1012.patch
      sql/Makefile.am:
        Import patch wl1012.patch
      sql/ha_innodb.cc:
        Import patch wl1012.patch
      sql/ha_innodb.h:
        Import patch wl1012.patch
      sql/ha_partition.cc:
        Import patch wl1012.patch
      sql/handler.cc:
        Import patch wl1012.patch
      sql/handler.h:
        Import patch wl1012.patch
      sql/item_sum.cc:
        Import patch wl1012.patch
      sql/log.cc:
        Import patch wl1012.patch
      sql/log_event.cc:
        Import patch wl1012.patch
      sql/log_event.h:
        Import patch wl1012.patch
      sql/mysql_priv.h:
        Import patch wl1012.patch
      sql/mysqld.cc:
        Import patch wl1012.patch
      sql/rpl_filter.h:
        Import patch wl1012.patch
      sql/set_var.cc:
        Import patch wl1012.patch
      sql/share/errmsg.txt:
        Import patch wl1012.patch
      sql/slave.cc:
        Import patch wl1012.patch
      sql/slave.h:
        Import patch wl1012.patch
      sql/sp.cc:
        Import patch wl1012.patch
      sql/sp_head.cc:
        Import patch wl1012.patch
      sql/sql_acl.cc:
        Import patch wl1012.patch
      sql/sql_base.cc:
        Import patch wl1012.patch
      sql/sql_class.cc:
        Import patch wl1012.patch
      sql/sql_class.h:
        Import patch wl1012.patch
      sql/sql_delete.cc:
        Import patch wl1012.patch
      sql/sql_insert.cc:
        Import patch wl1012.patch
      sql/sql_lex.h:
        Import patch wl1012.patch
      sql/sql_list.h:
        Import patch wl1012.patch
      sql/sql_load.cc:
        Import patch wl1012.patch
      sql/sql_parse.cc:
        Import patch wl1012.patch
      sql/sql_plugin.cc:
        Import patch wl1012.patch
      sql/sql_rename.cc:
        Import patch wl1012.patch
      sql/sql_repl.h:
        Import patch wl1012.patch
      sql/sql_select.cc:
        Import patch wl1012.patch
      sql/sql_show.cc:
        Import patch wl1012.patch
      sql/sql_table.cc:
        Import patch wl1012.patch
      sql/sql_udf.cc:
        Import patch wl1012.patch
      sql/sql_union.cc:
        Import patch wl1012.patch
      sql/sql_update.cc:
        Import patch wl1012.patch
      sql/sql_yacc.yy:
        Import patch wl1012.patch
      sql/table.cc:
        Import patch wl1012.patch
      sql/table.h:
        Import patch wl1012.patch
      storage/innobase/include/lock0lock.h:
        Import patch wl1012.patch
      storage/innobase/include/row0mysql.h:
        Import patch wl1012.patch
      storage/innobase/include/row0vers.h:
        Import patch wl1012.patch
      storage/innobase/lock/lock0lock.c:
        Import patch wl1012.patch
      storage/innobase/row/row0mysql.c:
        Import patch wl1012.patch
      storage/innobase/row/row0sel.c:
        Import patch wl1012.patch
      storage/innobase/row/row0vers.c:
        Import patch wl1012.patch
      09346e6e