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 · e78da462
      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.
      e78da462
  2. 02 Feb, 2009 1 commit
    • Serge Kozlov's avatar
      Post-merge patch for extra/rpl_test/rpl_log.test: · 512eaf42
      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.
      512eaf42
  3. 29 Oct, 2008 1 commit
    • Mats Kindahl's avatar
      Post-merge fixes to fix test cases. · f5504826
      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.
      f5504826
  4. 07 Oct, 2008 1 commit
    • Mats Kindahl's avatar
      Post-merge fixes. · df346862
      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.
      df346862
  5. 10 Jul, 2008 1 commit
    • Sven Sandberg's avatar
      BUG#37975: wait_for_slave_* should increase the timeout · 9d4ee0bf
      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.
      9d4ee0bf
  6. 14 Mar, 2008 1 commit
    • unknown's avatar
      Post-merge fixes. · c41299b1
      unknown authored
      mysql-test/extra/rpl_tests/rpl_loaddata.test:
        Removing SHOW MASTER STATUS that does not seem to make sense.
      mysql-test/extra/rpl_tests/rpl_log.test:
        Correcting test case to sync slave with master.
      mysql-test/suite/binlog/r/binlog_unsafe.result:
        Result change.
      mysql-test/suite/binlog/t/binlog_unsafe.test:
        Removing unsafe variable from list of safe variables.
      mysql-test/suite/rpl/r/rpl_loaddata.result:
        Result change.
      mysql-test/suite/rpl/r/rpl_skip_error.result:
        Result change.
      mysql-test/suite/rpl/t/rpl_skip_error.test:
        Correcting bad manual+automatic merge. Test is now only relevant for statement-
        based replication.
      sql/rpl_rli.cc:
        Correcting automerge undoing previous change of return value.
        Relay_log_info::wait_for_pos() should return -2 when not initialized to work
        correctly.
      c41299b1
  7. 20 Dec, 2007 1 commit
  8. 12 Dec, 2007 1 commit
    • unknown's avatar
      WL#4189 · cddb7ae5
      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
      cddb7ae5
  9. 27 Jul, 2007 2 commits
    • unknown's avatar
      WL#3228 (NDB) : RBR using different table defs on slave/master · 79b37df5
      unknown authored
      This patch adds the ability to store extra field metadata in the table
      map event. This data can include pack_length() or field_lenght() for
      fields such as CHAR or VARCHAR enabling developers to add code that
      can check for compatibilty between master and slave columns. More 
      importantly, the extra field metadata can be used to store data from the
      master correctly should a VARCHAR field on the master be <= 255 bytes 
      while the same field on the slave is > 255 bytes. '
      
      The patch also includes the needed changes to unpack to ensure that data
      which is smaller on the master can be unpacked correctly on the slave.
      
      
      mysql-test/extra/rpl_tests/rpl_log.test:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch changes the test to display slave status vertically.
      mysql-test/r/rpl_ndb_log.result:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch contains a result file for the new test designed to test the 
        feature of having columns on the master that are smaller than what is 
        on the slave.
      mysql-test/r/rpl_rbr_to_sbr.result:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch contains a result file for the new test designed to test the 
        feature of having columns on the master that are smaller than what is 
        on the slave.
      mysql-test/r/rpl_row_basic_11bugs.result:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch contains a result file for the new test designed to test the 
        feature of having columns on the master that are smaller than what is 
        on the slave.
      mysql-test/r/rpl_row_create_table.result:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch contains a result file for the new test designed to test the 
        feature of having columns on the master that are smaller than what is 
        on the slave.
      mysql-test/r/rpl_row_flsh_tbls.result:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch contains a result file for the new test designed to test the 
        feature of having columns on the master that are smaller than what is 
        on the slave.
      mysql-test/r/rpl_row_inexist_tbl.result:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch contains a result file for the new test designed to test the 
        feature of having columns on the master that are smaller than what is 
        on the slave.
      mysql-test/r/rpl_row_log.result:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch contains a result file for the new test designed to test the 
        feature of having columns on the master that are smaller than what is 
        on the slave.
      mysql-test/r/rpl_row_log_innodb.result:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch contains a result file for the new test designed to test the 
        feature of having columns on the master that are smaller than what is 
        on the slave.
      mysql-test/r/rpl_row_max_relay_size.result:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch contains a result file for the new test designed to test the 
        feature of having columns on the master that are smaller than what is 
        on the slave.
      mysql-test/r/rpl_row_until.result:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch contains a result file for the new test designed to test the 
        feature of having columns on the master that are smaller than what is 
        on the slave.
      mysql-test/r/rpl_stm_log.result:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch contains a result file for the rpl_log.test modifications.
      mysql-test/r/rpl_truncate_7ndb.result:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch contains a result file for the new test designed to test the 
        feature of having columns on the master that are smaller than what is 
        on the slave.
      mysql-test/t/binlog_row_mix_innodb_myisam.test:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch changes the test to coincide with changes to binlog
        size of table map event.
      mysql-test/t/rpl_row_create_table.test:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch changes the test to coincide with changes to binlog
        size of table map event.
      mysql-test/t/rpl_row_flsh_tbls.test:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch changes the test to coincide with changes to binlog
        size of table map event.
      sql/field.cc:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch includes updates to the unpack() methods for the variable
        length fields. A new parameter was added (from_length) that is the
        value stored in the field_metadata of the table map from the table_def
        class. If the value is non-zero and less than what the field on the 
        slave is then use the from_length else use the original value from the
        field on the slave.
      sql/field.h:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch includes updates to the unpack() methods for the variable
        length fields. A new parameter was added (from_length) that is the
        value stored in the field_metadata of the table map from the table_def
        class.
      sql/log_event.cc:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch adds methods to calculate the field metadata size, prepare
        the field metadata for writing to the binlog, and additions to the
        Table_map_log_event::write_body method to include the field metadata 
        in the table map that is written to the binlog.
      sql/log_event.h:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch adds method declarations and variables needed to support
        storing field metadata in the table map that is written to the binlog.
      sql/rpl_record.cc:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch modifies the unpack_row() method to unpack fields passing in
        the value from the table_def class. This value is the extra field
        metadata stored there from the master.
      sql/rpl_rli.h:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch adds a helper function to retrieve the table_def for a given
        table in the RPL_TABLE_LIST structure.
      sql/rpl_utility.cc:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch adds a helper method that retrieves the correct size 
        parameter for the field. This method is used to compare the size as
        sent by the master with that on the slave for all types of fields that
        can vary in size and storage requirements.
      sql/rpl_utility.h:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch changes the table_def class constructor to pass in the raw
        data read from the table map and extract it into an array of dimension
        size (number of fields). It also adds a method to return the field 
        metadata for any field. The method returns the data stored in the table
        map or 0 if no data was stored for that field. Lastly, a method to return
        the results of field->maybe_null() is included so that the slave can
        determine if a field that is not on the slave is null.
      mysql-test/t/rpl_colSize.test:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch contains a new test designed to test the feature of having
        columns on the master that are smaller than what is on the slave.
      mysql-test/r/rpl_colSize.result:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch contains a result file for the new test designed to test the 
        feature of having columns on the master that are smaller than what is 
        on the slave.
      79b37df5
    • unknown's avatar
      WL#3228 (NDB) : RBR using different table defs on slave/master · ef6664fe
      unknown authored
      This patch adds the ability to store extra field metadata in the table
      map event. This data can include pack_length() or field_lenght() for
      fields such as CHAR or VARCHAR enabling developers to add code that
      can check for compatibilty between master and slave columns. More 
      importantly, the extra field metadata can be used to store data from the
      master correctly should a VARCHAR field on the master be <= 255 bytes 
      while the same field on the slave is > 255 bytes. '
      
      The patch also includes the needed changes to unpack to ensure that data
      which is smaller on the master can be unpacked correctly on the slave.
      
      
      mysql-test/extra/rpl_tests/rpl_log.test:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch changes the test to display slave status vertically.
      mysql-test/r/rpl_ndb_log.result:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch contains a result file for the new test designed to test the 
        feature of having columns on the master that are smaller than what is 
        on the slave.
      mysql-test/r/rpl_rbr_to_sbr.result:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch contains a result file for the new test designed to test the 
        feature of having columns on the master that are smaller than what is 
        on the slave.
      mysql-test/r/rpl_row_basic_11bugs.result:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch contains a result file for the new test designed to test the 
        feature of having columns on the master that are smaller than what is 
        on the slave.
      mysql-test/r/rpl_row_create_table.result:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch contains a result file for the new test designed to test the 
        feature of having columns on the master that are smaller than what is 
        on the slave.
      mysql-test/r/rpl_row_flsh_tbls.result:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch contains a result file for the new test designed to test the 
        feature of having columns on the master that are smaller than what is 
        on the slave.
      mysql-test/r/rpl_row_inexist_tbl.result:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch contains a result file for the new test designed to test the 
        feature of having columns on the master that are smaller than what is 
        on the slave.
      mysql-test/r/rpl_row_log.result:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch contains a result file for the new test designed to test the 
        feature of having columns on the master that are smaller than what is 
        on the slave.
      mysql-test/r/rpl_row_log_innodb.result:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch contains a result file for the new test designed to test the 
        feature of having columns on the master that are smaller than what is 
        on the slave.
      mysql-test/r/rpl_row_max_relay_size.result:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch contains a result file for the new test designed to test the 
        feature of having columns on the master that are smaller than what is 
        on the slave.
      mysql-test/r/rpl_row_until.result:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch contains a result file for the new test designed to test the 
        feature of having columns on the master that are smaller than what is 
        on the slave.
      mysql-test/r/rpl_stm_log.result:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch contains a result file for the rpl_log.test modifications.
      mysql-test/r/rpl_truncate_7ndb.result:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch contains a result file for the new test designed to test the 
        feature of having columns on the master that are smaller than what is 
        on the slave.
      mysql-test/t/binlog_row_mix_innodb_myisam.test:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch changes the test to coincide with changes to binlog
        size of table map event.
      mysql-test/t/rpl_row_create_table.test:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch changes the test to coincide with changes to binlog
        size of table map event.
      mysql-test/t/rpl_row_flsh_tbls.test:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch changes the test to coincide with changes to binlog
        size of table map event.
      sql/field.cc:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch includes updates to the unpack() methods for the variable
        length fields. A new parameter was added (from_length) that is the
        value stored in the field_metadata of the table map from the table_def
        class. If the value is non-zero and less than what the field on the 
        slave is then use the from_length else use the original value from the
        field on the slave.
      sql/field.h:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch includes updates to the unpack() methods for the variable
        length fields. A new parameter was added (from_length) that is the
        value stored in the field_metadata of the table map from the table_def
        class.
      sql/log_event.cc:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch adds methods to calculate the field metadata size, prepare
        the field metadata for writing to the binlog, and additions to the
        Table_map_log_event::write_body method to include the field metadata 
        in the table map that is written to the binlog.
      sql/log_event.h:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch adds method declarations and variables needed to support
        storing field metadata in the table map that is written to the binlog.
      sql/rpl_record.cc:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch modifies the unpack_row() method to unpack fields passing in
        the value from the table_def class. This value is the extra field
        metadata stored there from the master.
      sql/rpl_rli.h:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch adds a helper function to retrieve the table_def for a given
        table in the RPL_TABLE_LIST structure.
      sql/rpl_utility.cc:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch adds a helper method that retrieves the correct size 
        parameter for the field. This method is used to compare the size as
        sent by the master with that on the slave for all types of fields that
        can vary in size and storage requirements.
      sql/rpl_utility.h:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch changes the table_def class constructor to pass in the raw
        data read from the table map and extract it into an array of dimension
        size (number of fields). It also adds a method to return the field 
        metadata for any field. The method returns the data stored in the table
        map or 0 if no data was stored for that field. Lastly, a method to return
        the results of field->maybe_null() is included so that the slave can
        determine if a field that is not on the slave is null.
      mysql-test/r/rpl_colSize.result:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch contains a result file for the new test designed to test the 
        feature of having columns on the master that are smaller than what is 
        on the slave.
      mysql-test/t/rpl_colSize.test:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch contains a new test designed to test the feature of having
        columns on the master that are smaller than what is on the slave.
      ef6664fe
  10. 12 Jul, 2007 1 commit
    • unknown's avatar
      Bug#19259 rpl_ndb_dd_partitions failed on Solaris · aa28f458
      unknown authored
      Actually, this testcase will fail generally on all testing platforms.
      The bugs come from the inconsistent bitmap between rpl master and slave.
      
      In log_event.cc, the n_bits of m_cols and m_cols_ai are intialized with octal-ceiling 
      m_width, in fact, their n_bits should be equal to m_width.
      Wrong n_bits will cause bitmap_bits_set() get incorrect value in unpack_row()
      in rpl_record.cc, 
      then an assertion in unpack_row() will fail and crash sql thread.
        DBUG_ASSERT(null_ptr == row_data + master_null_byte_count);
      
      Meanwhile, because of binlog_prepare_pending_rows_event() changed with correct
      m_cols, some results of specific testcases should be updated:
      binlog_multi_engine.test
      ndb_binlog_multi.test
      rpl_ndb_dd_partitions.test
      rpl_ndb_log.test
      rpl_truncate_7ndb.test
      rpl_truncate_7ndb_2.test
      
      In addition, to ensure rows replication correct between master and slave after the patch, 
      two 'select * from t1' are added in extra/rpl_tests/rpl_log.test, and some testcases include 
      rpl_log.test, therefore, the results of these testcases should be updated likewise:
      rpl_stm_log.test
      rpl_row_log.test
      rpl_ndb_log.test
      rpl_row_log_innodb.test
      
      Totally, results of nine testcases are updated.
      
      
      include/my_bitmap.h:
        add declaration for create_last_word_mask(), since we need to use it in log_event.cc
      mysql-test/extra/rpl_tests/rpl_log.test:
        add 'select * from t1' both on master and slave to ensure the replication consistent after patched
      mysql-test/r/binlog_multi_engine.result:
        update result
        
        the following is commented by Andrei, 
        The differences can be explained.
        Look at
        lines of THD::binlog_prepare_pending_rows_event
        
          if (!pending)
               ...
              !bitmap_cmp(pending->get_cols(), cols))
        
        The row event disappears because after correcting master side Write_rows_log_event's m_col bitmap initialization, 
        this event has the same m_cols as the preceding one and thereafter they got glued into one bigger size event. 
        This is the correct behaviour now.
      mysql-test/r/ndb_binlog_multi.result:
        update result
        same reason with binlog_multi_engine for Write_rows_log_event
      mysql-test/r/rpl_ndb_dd_partitions.result:
        update result,
        reasons:
        1. tablespace description format changed
        2. hex(b1) from 1 to 0 because there is a update sentence in include/rpl_multi_engine3.inc
        UPDATE t1 SET b1 = 0, t="2006-02-22" WHERE id = 412;
      mysql-test/r/rpl_ndb_log.result:
        update result
        Write_rows event disapper for same reason with binlog_multi_engine ;
        In addition, because add new select in extra/rpl_testsrpl_log.test, 
        corresponding new results are accompanying.
      mysql-test/r/rpl_row_log.result:
        because add new select in extra/rpl_testsrpl_log.test, 
        corresponding new results are accompanying.
      mysql-test/r/rpl_row_log_innodb.result:
        because add new select in extra/rpl_testsrpl_log.test, 
        corresponding new results are accompanying.
      mysql-test/r/rpl_stm_log.result:
        because add new select in extra/rpl_testsrpl_log.test, 
        corresponding new results are accompanying.
      mysql-test/r/rpl_truncate_7ndb.result:
        update result
        same reason with binlog_multi_engine for Write_rows_log_event
      mysql-test/r/rpl_truncate_7ndb_2.result:
        update result
        same reason with binlog_multi_engine for Write_rows_log_event
        
        And for the change
        -master-bin.000001  4   Format_desc  1   102 Server ver: SERVER_VERSION, Binlog ver: 4
        +master-bin.000001  4   Format_desc  1   106 Server ver: SERVER_VERSION, Binlog ver
        
        It's  okay as FormatDescription event matured for 4 bytes since the last time the results had been recorded.
      mysql-test/t/disabled.def:
        resume this test case
      sql/log_event.cc:
        initialize m_cols' n_bits with m_width instead of octal-round(m_width);
        initialize m_cols_ai' n_bits with m_width instead of octal-round(m_width);
        after memcpy(), call create_last_word_mask() to clear extra bits in bitmap to ensure safety
      mysql-test/t/rpl_ndb_dd_partitions-master.opt:
        add --new=true passed to mysqld
      mysql-test/t/rpl_ndb_dd_partitions-slave.opt:
        add --new=true passed to mysqld
      aa28f458
  11. 18 Jun, 2007 1 commit
    • unknown's avatar
      fixes Bug #25305 (and several other similar test tailures with the same symptom) · 7b081501
      unknown authored
      - make tests wait until ndb connects properly
      
      
      mysql-test/extra/rpl_tests/rpl_commit_after_flush.test:
        make tests wait until ndb connects properly
      mysql-test/extra/rpl_tests/rpl_delete_no_where.test:
        make tests wait until ndb connects properly
      mysql-test/extra/rpl_tests/rpl_insert_ignore.test:
        make tests wait until ndb connects properly
      mysql-test/extra/rpl_tests/rpl_log.test:
        make tests wait until ndb connects properly
      mysql-test/extra/rpl_tests/rpl_multi_update2.test:
        make tests wait until ndb connects properly
      mysql-test/extra/rpl_tests/rpl_multi_update3.test:
        make tests wait until ndb connects properly
      mysql-test/extra/rpl_tests/rpl_relayrotate.test:
        make tests wait until ndb connects properly
      mysql-test/extra/rpl_tests/rpl_row_001.test:
        make tests wait until ndb connects properly
      mysql-test/extra/rpl_tests/rpl_row_UUID.test:
        make tests wait until ndb connects properly
      mysql-test/extra/rpl_tests/rpl_row_basic.test:
        make tests wait until ndb connects properly
      mysql-test/extra/rpl_tests/rpl_row_blob.test:
        make tests wait until ndb connects properly
      mysql-test/extra/rpl_tests/rpl_row_charset.test:
        make tests wait until ndb connects properly
      mysql-test/extra/rpl_tests/rpl_row_func003.test:
        make tests wait until ndb connects properly
      mysql-test/extra/rpl_tests/rpl_row_sp003.test:
        make tests wait until ndb connects properly
      mysql-test/extra/rpl_tests/rpl_row_sp006.test:
        make tests wait until ndb connects properly
      mysql-test/include/have_multi_ndb.inc:
        make tests wait until ndb connects properly
      mysql-test/include/have_ndb.inc:
        make tests wait until ndb connects properly
      mysql-test/include/ndb_not_readonly.inc:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_commit_after_flush.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_delete_no_where.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_insert_ignore.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_multi_update2.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_multi_update3.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_2innodb.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_2myisam.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_UUID.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_auto_inc.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_bank.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_basic.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_blob.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_blob2.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_charset.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_circular.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_circular_simplex.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_commit_afterflush.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_dd_advance.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_dd_basic.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_dd_partitions.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_ddl.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_delete_nowhere.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_do_db.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_do_table.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_extraCol.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_func003.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_idempotent.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_innodb2ndb.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_innodb_trans.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_insert_ignore.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_load.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_log.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_multi.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_multi_update2.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_multi_update3.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_myisam2ndb.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_relayrotate.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_rep_ignore.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_row_001.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_sp003.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_sp006.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_stm_innodb.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_sync.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_trig004.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndbapi_multi.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_relayrotate.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_row_001.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_row_UUID.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_row_basic_2myisam.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_row_basic_3innodb.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_row_basic_7ndb.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_row_blob_innodb.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_row_blob_myisam.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_row_charset.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_row_func003.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_row_log.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_row_log_innodb.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_row_sp003.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_row_sp006_InnoDB.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_stm_log.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_truncate_7ndb.test:
        make tests wait until ndb connects properly
      mysql-test/include/ndb_master-slave.inc:
        New BitKeeper file ``mysql-test/include/ndb_master-slave.inc''
      7b081501
  12. 11 Jun, 2007 1 commit
    • unknown's avatar
      BUG#24954 (Last_errno and Last_error not set after master_retry_count has · fa22cf36
      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().
      fa22cf36
  13. 30 Mar, 2007 1 commit
    • unknown's avatar
      - Fixing binary log positions · e101dee4
      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.
      e101dee4
  14. 29 Mar, 2007 1 commit
    • unknown's avatar
      WL#3464: Add replication event to denote gap in replication · 37cf6529
      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''
      37cf6529
  15. 01 Mar, 2007 1 commit
    • unknown's avatar
      Switch back to master before cleanup of the created tables · 6a880e94
      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
      6a880e94
  16. 12 Feb, 2007 1 commit
    • unknown's avatar
      BUG#22583 (RBR between MyISAM and non-MyISAM tables containing BIT field · 06224585
      unknown authored
      does not work): Changing packed row format to only include null bits
      for those columns that are present in the row as well as writing BIT
      columns in a storage engine-independent format.
      
      The change in row format is incompatible with the previous format and a
      slave will not be able to read the new events.
      
      
      mysql-test/extra/rpl_tests/rpl_deadlock.test:
        Position change since Format_description_log_event is longer.
      mysql-test/extra/rpl_tests/rpl_log.test:
        Position change since Format_description_log_event is longer.
      mysql-test/extra/rpl_tests/rpl_row_charset.test:
        Position change since Format_description_log_event is longer.
      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_log_pos.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_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/t/rpl_loaddata_s.test:
        Position change since Format_description_log_event is longer.
      mysql-test/t/rpl_log_pos.test:
        Position change since Format_description_log_event is longer.
      mysql-test/t/rpl_row_basic_11bugs-master.opt:
        Adding --innodb option
      mysql-test/t/rpl_row_basic_11bugs.test:
        Testing explicitly for RBR MyISAM -> InnoDB and vice versa.
        Position change since Format_description_log_event is longer.
      mysql-test/t/rpl_row_create_table.test:
        Position change since Format_description_log_event is longer.
      mysql-test/t/rpl_row_flsh_tbls.test:
        Position change since Format_description_log_event is longer.
      mysql-test/t/rpl_row_mysqlbinlog.test:
        Position change since Format_description_log_event is longer.
      mysql-test/t/rpl_switch_stm_row_mixed.test:
        Position change since Format_description_log_event is longer.
      mysql-test/t/user_var-binlog.test:
        Position change since Format_description_log_event is longer.
      sql/log_event.cc:
        Changing packed row format to only include null bits for those columns
        that are present in the row as well as writing BIT columns in a storage
        engine-independent format.
        
        Changing unpack_row() to accomodate for the changes.
      sql/log_event.h:
        Renumbering old row events and adding new codes.
      sql/sql_class.cc:
        Changing packed row format to only include null bits for those columns
        that are present in the row as well as writing BIT columns in a storage
        engine-independent format.
        
        Changing THD::pack_row() to accomodate for the changes and adding
        documentation.
      mysql-test/t/rpl_row_basic_11bugs-slave.opt:
        New BitKeeper file ``mysql-test/t/rpl_row_basic_11bugs-slave.opt''
      06224585
  17. 21 Jun, 2006 2 commits
    • unknown's avatar
      Change table_id's to # to make tests portable · 74aeb836
      unknown authored
      mysql-test/extra/rpl_tests/rpl_log.test:
        Change table_id's to # to make test portable
      mysql-test/r/rpl_ndb_log.result:
        Update test result to use table_id: #
      mysql-test/r/rpl_row_log.result:
        Update test result to use table_id: #
      mysql-test/r/rpl_row_log_innodb.result:
        Update test result to use table_id: #
      74aeb836
    • unknown's avatar
      Fix for bug #20601: rpl_ndb_log.test failure · 1265f5d6
      unknown authored
      mysql-test/extra/rpl_tests/rpl_log.test:
        Fix for bug #20601: rpl_ndb_log.test failure
          - replace insignificant columns to make tests repeatable
      mysql-test/r/rpl_ndb_log.result:
        Fix for bug #20601: rpl_ndb_log.test failure
          - result adjusted
      mysql-test/r/rpl_row_log.result:
        Fix for bug #20601: rpl_ndb_log.test failure
          - result adjusted
      mysql-test/r/rpl_row_log_innodb.result:
        Fix for bug #20601: rpl_ndb_log.test failure
          - result adjusted
      1265f5d6
  18. 19 Jun, 2006 1 commit
    • unknown's avatar
      rpl_log.test, rpl_stm_log.result: · 6f5c5c3c
      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
      6f5c5c3c
  19. 31 May, 2006 1 commit
    • unknown's avatar
      Cleanup testcases · 810824d7
      unknown authored
       - Add  missing drop(s)
       - Reset changed variables
      
      NOTE! These kind of problems are easily found with --check-testcases options to mysql-test-run.pl 
      
      
      mysql-test/extra/rpl_tests/rpl_insert_id_pk.test:
        Add missing drop table
      mysql-test/extra/rpl_tests/rpl_loaddata.test:
        Add missing drop table
      mysql-test/extra/rpl_tests/rpl_log.test:
        Tables where only dropped on slave, switch to master connection before dropping them
      mysql-test/extra/rpl_tests/rpl_multi_update3.test:
        Add missing drop table
      mysql-test/extra/rpl_tests/rpl_row_sp006.test:
        Add missing drop database
      mysql-test/include/check-testcase.test:
        Add option "--skip-lock-tables" when dumping tables, as noone else is using the tables anyway
      mysql-test/r/ndb_cache_multi.result:
        Reset query_cache_size after test on both master and "second" master mysqld
      mysql-test/r/partition.result:
        Add missing drop procedure
      mysql-test/r/rpl_drop_db.result:
        Add missing drop table
      mysql-test/r/rpl_multi_update3.result:
        Add missing drop table
      mysql-test/r/rpl_ndb_multi_update3.result:
        Add missing drop table
      mysql-test/r/rpl_ndb_sp006.result:
        Add missing drop database
      mysql-test/r/rpl_stm_no_op.result:
        Add missing drop table
      mysql-test/r/rpl_variables.result:
        Reset slave_net_timeout to it's default value after test
      mysql-test/t/ndb_cache_multi.test:
        Reset query_cahche_size after test
      mysql-test/t/partition.test:
        Add missing drop procedure
      mysql-test/t/rpl_drop_db.test:
        Add missing drop table
      mysql-test/t/rpl_stm_no_op.test:
        Add missing drop table
      mysql-test/t/rpl_variables.test:
        Reset slave_net_timeout to it's default value after test
      810824d7
  20. 16 May, 2006 2 commits
    • unknown's avatar
      Updated to fix bug in AIX · 445186eb
      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
      445186eb
    • unknown's avatar
      rpl_log.test: · 6032f687
      unknown authored
        Fix for failure in aix52 failure during push build
      
      
      mysql-test/extra/rpl_tests/rpl_log.test:
        Fix for failure in aix52 failure during push build
      6032f687
  21. 10 May, 2006 2 commits
    • unknown's avatar
      rpl_log.test: · ca277d58
      unknown authored
        Remove comments not needed
      
      
      mysql-test/extra/rpl_tests/rpl_log.test:
        Remove comments not needed
      ca277d58
    • unknown's avatar
      rpl_log.test: · 95f6fc9d
      unknown authored
        Correct fix for test bug #19158
      
      
      mysql-test/extra/rpl_tests/rpl_log.test:
        Correct fix for test bug #19158
      95f6fc9d
  22. 18 Apr, 2006 1 commit
  23. 24 Feb, 2006 1 commit
    • unknown's avatar
      WL#3023 (RBR: Use locks in a statement-like manner): · e626e9f1
      unknown authored
        Adaptions to make it work with NDB.
      
      
      mysql-test/extra/binlog_tests/binlog.test:
        Using replace_regex to remove table id.
      mysql-test/extra/binlog_tests/blackhole.test:
        Using replace_regex to remove table id.
      mysql-test/extra/binlog_tests/ctype_cp932.test:
        Using replace_regex to remove table id.
      mysql-test/extra/binlog_tests/ctype_cp932_binlog.test:
        Using replace_regex to remove table id.
      mysql-test/extra/binlog_tests/ctype_ucs_binlog.test:
        Using replace_regex to remove table id.
      mysql-test/extra/binlog_tests/drop_temp_table.test:
        Using replace_regex to remove table id.
      mysql-test/extra/binlog_tests/insert_select-binlog.test:
        Using replace_regex to remove table id.
      mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
        Using replace_regex to remove table id.
      mysql-test/extra/rpl_tests/rpl_flsh_tbls.test:
        Using replace_regex to remove table id.
      mysql-test/extra/rpl_tests/rpl_log.test:
        Using replace_regex to remove table id.
      mysql-test/extra/rpl_tests/rpl_multi_query.test:
        Using replace_regex to remove table id.
      mysql-test/extra/rpl_tests/rpl_row_charset.test:
        Using replace_regex to remove table id.
      mysql-test/extra/rpl_tests/rpl_row_delayed_ins.test:
        Using replace_regex to remove table id.
      mysql-test/extra/rpl_tests/rpl_stm_charset.test:
        Using replace_regex to remove table id.
      mysql-test/include/rpl_row_basic.inc:
        Removing sync with master on cleanup since there are engines that does
        not work in a "syncronized" fashion on dropping tables.
      mysql-test/r/binlog_row_binlog.result:
        Result change
      mysql-test/r/binlog_row_blackhole.result:
        Result change
      mysql-test/r/binlog_row_ctype_cp932.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/ctype_cp932_binlog_row.result:
        Result change
      mysql-test/r/rpl_row_basic_11bugs.result:
        Result change
      mysql-test/r/rpl_row_basic_2myisam.result:
        Result change
      mysql-test/r/rpl_row_basic_3innodb.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_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_sp008.result:
        Result change
      mysql-test/t/binlog_stm_binlog.test:
        Using replace_regex to remove table id.
      mysql-test/t/ndb_binlog_ddl_multi.test:
        Using replace_regex to remove table id.
      mysql-test/t/ndb_binlog_ignore_db.test:
        Using replace_regex to remove table id.
      mysql-test/t/rpl_heap.test:
        Using replace_regex to remove table id.
      mysql-test/t/rpl_loaddata_s.test:
        Using replace_regex to remove table id.
      mysql-test/t/rpl_ndb_blob.test:
        Using replace_regex to remove table id.
      mysql-test/t/rpl_ndb_disk.test:
        Using replace_regex to remove table id.
      mysql-test/t/rpl_row_basic_11bugs.test:
        Using replace_regex to remove table id.
      mysql-test/t/rpl_row_create_table.test:
        Using replace_regex to remove table id.
      mysql-test/t/rpl_row_drop.test:
        Using replace_regex to remove table id.
      mysql-test/t/rpl_row_sp008.test:
        Using replace_regex to remove table id.
      mysql-test/t/rpl_sp.test:
        Using replace_regex to remove table id.
      mysql-test/t/sp.test:
        Using replace_regex to remove table id.
      mysql-test/t/sp_notembedded.test:
        Using replace_regex to remove table id.
      mysql-test/t/user_var-binlog.test:
        Using replace_regex to remove table id.
      sql/ha_ndbcluster_binlog.cc:
        Assign_new_table_id() now takes table share.
        Removed gratuitous friend declaration of ndb_add_binlog_index().
        Turning of binlogging during execution of ndb_add_binlog_index().
      sql/handler.h:
        Removed gratuitous friend declaration of ndb_add_binlog_index().
      sql/log.cc:
        Adding debug printout.
      sql/log_event.cc:
        Closing thread tables on dummy event.
      sql/rpl_injector.cc:
        Added support for new locking scheme.
      sql/rpl_injector.h:
        Added support for new locking scheme.
      e626e9f1
  24. 16 Feb, 2006 1 commit
    • unknown's avatar
      Test cleanup · 4b6def06
      unknown authored
      mysql-test/t/disabled.def:
        Updated
      mysql-test/extra/rpl_tests/rpl_log.test:
        Updated and moved drop of tables to end of test to help bin log be more deterministic
      mysql-test/r/rpl_row_log.result:
        Updated results
      mysql-test/r/rpl_row_log_innodb.result:
        Updated results
      mysql-test/r/rpl_ndb_log.result:
        Updated results
      4b6def06
  25. 06 Feb, 2006 1 commit
    • unknown's avatar
      More test case updates for using RPL with NDB as default engine · 84aeaaa5
      unknown authored
      mysql-test/t/rpl_create_database.test:
        Updated to pass when other default engines are being used
      mysql-test/r/rpl_create_database.result:
        Updated to pass when other default engines are being used
      mysql-test/t/rpl_row_func003-slave.opt:
        new opt file to enusre innodb on slave
      mysql-test/t/rpl_replicate_do.test:
        Updated with order by for use during ndb testing
      mysql-test/r/rpl_replicate_do.result:
        Updated with order by for use during ndb testing
      mysql-test/t/rpl_redirect.test:
        updated with order by
      mysql-test/r/rpl_redirect.result:
        updated with order by
      mysql-test/t/rpl_ndb_func003.test:
        New func003 wrapper to use NDB engine for table creation
      mysql-test/r/rpl_ndb_func003.result:
        New func003 wrapper to use NDB engine for table creation
      mysql-test/r/rpl_row_sp001.result:
        updated with order by
      mysql-test/t/rpl_row_sp001.test:
        updated with order by
      BitKeeper/deleted/.del-rpl_row_log.test~f6ed1be9e3ca110f:
        Delete: mysql-test/extra/rpl_tests/rpl_row_log.test
      mysql-test/extra/rpl_tests/rpl_log.test:
        Updated test to ensure that MyISAM, and innodb engines passed even if NDB was used as default engine. Due to diff in bin log output between MyISAM, InnoDB and NDB the file had to use different wrappers and results files.
      mysql-test/t/rpl_row_log.test:
        part of rpl_log.test check in
      mysql-test/r/rpl_row_log.result:
        part of rpl_log.test check in
      mysql-test/r/rpl_row_log_innodb.result:
        part of rpl_log.test check in
      mysql-test/t/rpl_row_log_innodb-master.opt:
        part of rpl_log.test check in
      mysql-test/t/rpl_row_log_innodb-slave.opt:
        part of rpl_log.test check in
      mysql-test/t/rpl_row_log_innodb.test:
        part of rpl_log.test check in
      mysql-test/r/rpl_ndb_log.result:
        part of rpl_log.test check in
      mysql-test/t/rpl_ndb_log.test:
        part of rpl_log.test check in
      mysql-test/t/rpl_ndb_log-master.opt:
        part of rpl_log.test check in
      mysql-test/t/disabled.def:
        Updated with MySQL Bugs: #17158
      84aeaaa5
  26. 22 Dec, 2005 1 commit
    • unknown's avatar
      WL#1012: All changes as one single changeset. · 00d4af11
      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
      00d4af11
  27. 12 Sep, 2005 1 commit
  28. 28 Jul, 2005 1 commit
    • unknown's avatar
      Added end marker for tests to make future merges easier · 0062e643
      unknown authored
      mysql-test/t/alias.test:
        Added end marker for test to make future merges easier
      mysql-test/t/alter_table.test:
        Added end marker for test to make future merges easier
      mysql-test/t/analyse.test:
        Added end marker for test to make future merges easier
      mysql-test/t/analyze.test:
        Added end marker for test to make future merges easier
        Fixed length of comment lines
      mysql-test/t/ansi.test:
        Added end marker for test to make future merges easier
      mysql-test/t/archive.test:
        Added end marker for test to make future merges easier
      mysql-test/t/auto_increment.test:
        Added end marker for test to make future merges easier
      mysql-test/t/backup.test:
        Added end marker for test to make future merges easier
      mysql-test/t/bdb-alter-table-1.test:
        Added end marker for test to make future merges easier
      mysql-test/t/bdb-alter-table-2.test:
        Added end marker for test to make future merges easier
      mysql-test/t/bdb-crash.test:
        Added end marker for test to make future merges easier
      mysql-test/t/bdb-deadlock.test:
        Added end marker for test to make future merges easier
      mysql-test/t/bdb-deadlock.tminus:
        Added end marker for test to make future merges easier
      mysql-test/t/bdb.test:
        Added end marker for test to make future merges easier
      mysql-test/t/bdb_cache.test:
        Added end marker for test to make future merges easier
      mysql-test/t/bench_count_distinct.test:
        Added end marker for test to make future merges easier
      mysql-test/t/bigint.test:
        Added end marker for test to make future merges easier
      mysql-test/t/binary.test:
        Added end marker for test to make future merges easier
      mysql-test/t/blackhole.test:
        Added end marker for test to make future merges easier
      mysql-test/t/bool.test:
        Added end marker for test to make future merges easier
      mysql-test/t/bulk_replace.test:
        Added end marker for test to make future merges easier
      mysql-test/t/case.test:
        Added end marker for test to make future merges easier
      mysql-test/t/cast.test:
        Added end marker for test to make future merges easier
      mysql-test/t/check.test:
        Added end marker for test to make future merges easier
      mysql-test/t/comments.test:
        Added end marker for test to make future merges easier
      mysql-test/t/compare.test:
        Added end marker for test to make future merges easier
      mysql-test/t/connect.test:
        Added end marker for test to make future merges easier
      mysql-test/t/consistent_snapshot.test:
        Added end marker for test to make future merges easier
      mysql-test/t/constraints.test:
        Added end marker for test to make future merges easier
      mysql-test/t/count_distinct.test:
        Added end marker for test to make future merges easier
      mysql-test/t/count_distinct2.test:
        Added end marker for test to make future merges easier
      mysql-test/t/count_distinct3.test:
        Added end marker for test to make future merges easier
      mysql-test/t/create.test:
        Added end marker for test to make future merges easier
      mysql-test/t/create_select_tmp.test:
        Added end marker for test to make future merges easier
      mysql-test/t/csv.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_big5.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_collate.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_cp1250_ch.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_cp1251.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_cp932.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_create.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_gbk.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_latin1.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_latin1_de.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_latin2.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_many.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_mb.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_recoding.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_sjis.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_tis620.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_uca.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_ucs.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_ucs_binlog.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_ujis.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ctype_utf8.test:
        Added end marker for test to make future merges easier
      mysql-test/t/date_formats.test:
        Added end marker for test to make future merges easier
      mysql-test/t/delayed.test:
        Added end marker for test to make future merges easier
      mysql-test/t/delete.test:
        Added end marker for test to make future merges easier
      mysql-test/t/derived.test:
        Added end marker for test to make future merges easier
      mysql-test/t/dirty_close.test:
        Added end marker for test to make future merges easier
      mysql-test/t/distinct.test:
        Added end marker for test to make future merges easier
      mysql-test/t/drop.test:
        Added end marker for test to make future merges easier
      mysql-test/t/drop_temp_table.test:
        Added end marker for test to make future merges easier
      mysql-test/t/empty_table.test:
        Added end marker for test to make future merges easier
      mysql-test/t/endspace.test:
        Added end marker for test to make future merges easier
      mysql-test/t/errors.test:
        Added end marker for test to make future merges easier
      mysql-test/t/exampledb.test:
        Added end marker for test to make future merges easier
      mysql-test/t/explain.test:
        Added end marker for test to make future merges easier
      mysql-test/t/flush.test:
        Added end marker for test to make future merges easier
      mysql-test/t/flush_block_commit.test:
        Added end marker for test to make future merges easier
      mysql-test/t/flush_table.test:
        Added end marker for test to make future merges easier
      mysql-test/t/foreign_key.test:
        Added end marker for test to make future merges easier
      mysql-test/t/fulltext.test:
        Added end marker for test to make future merges easier
      mysql-test/t/fulltext2.test:
        Added end marker for test to make future merges easier
      mysql-test/t/fulltext_cache.test:
        Added end marker for test to make future merges easier
      mysql-test/t/fulltext_distinct.test:
        Added end marker for test to make future merges easier
      mysql-test/t/fulltext_left_join.test:
        Added end marker for test to make future merges easier
      mysql-test/t/fulltext_multi.test:
        Added end marker for test to make future merges easier
      mysql-test/t/fulltext_order_by.test:
        Added end marker for test to make future merges easier
      mysql-test/t/fulltext_update.test:
        Added end marker for test to make future merges easier
      mysql-test/t/fulltext_var.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_compress.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_concat.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_crypt.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_date_add.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_default.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_des_encrypt.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_encrypt.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_encrypt_nossl.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_equal.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_gconcat.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_group.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_if.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_in.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_isnull.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_like.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_math.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_misc.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_op.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_regexp.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_sapdb.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_set.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_str.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_system.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_test.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_time.test:
        Added end marker for test to make future merges easier
      mysql-test/t/func_timestamp.test:
        Added end marker for test to make future merges easier
      mysql-test/t/gcc296.test:
        Added end marker for test to make future merges easier
      mysql-test/t/gis-rtree.test:
        Added end marker for test to make future merges easier
      mysql-test/t/gis.test:
        Added end marker for test to make future merges easier
      mysql-test/t/grant.test:
        Added end marker for test to make future merges easier
      mysql-test/t/grant2.test:
        Added end marker for test to make future merges easier
      mysql-test/t/grant_cache.test:
        Added end marker for test to make future merges easier
      mysql-test/t/group_by.test:
        Added end marker for test to make future merges easier
      mysql-test/t/handler.test:
        Added end marker for test to make future merges easier
      mysql-test/t/having.test:
        Added end marker for test to make future merges easier
      mysql-test/t/heap.test:
        Added end marker for test to make future merges easier
      mysql-test/t/heap_auto_increment.test:
        Added end marker for test to make future merges easier
      mysql-test/t/heap_btree.test:
        Added end marker for test to make future merges easier
      mysql-test/t/heap_hash.test:
        Added end marker for test to make future merges easier
      mysql-test/t/help.test:
        Added end marker for test to make future merges easier
      mysql-test/t/init_connect.test:
        Added end marker for test to make future merges easier
      mysql-test/t/init_file.test:
        Added end marker for test to make future merges easier
      mysql-test/t/innodb-deadlock.test:
        Added end marker for test to make future merges easier
      mysql-test/t/innodb-lock.test:
        Added end marker for test to make future merges easier
      mysql-test/t/innodb-replace.test:
        Added end marker for test to make future merges easier
      mysql-test/t/innodb.test:
        Added end marker for test to make future merges easier
      mysql-test/t/innodb_cache.test:
        Added end marker for test to make future merges easier
      mysql-test/t/innodb_handler.test:
        Added end marker for test to make future merges easier
      mysql-test/t/insert.test:
        Added end marker for test to make future merges easier
      mysql-test/t/insert_select-binlog.test:
        Added end marker for test to make future merges easier
      mysql-test/t/insert_select.test:
        Added end marker for test to make future merges easier
      mysql-test/t/insert_update.test:
        Added end marker for test to make future merges easier
      mysql-test/t/isam.test:
        Added end marker for test to make future merges easier
      mysql-test/t/join.test:
        Added end marker for test to make future merges easier
      mysql-test/t/join_crash.test:
        Added end marker for test to make future merges easier
      mysql-test/t/join_outer.test:
        Added end marker for test to make future merges easier
      mysql-test/t/key.test:
        Added end marker for test to make future merges easier
      mysql-test/t/key_cache.test:
        Added end marker for test to make future merges easier
      mysql-test/t/key_diff.test:
        Added end marker for test to make future merges easier
      mysql-test/t/key_primary.test:
        Added end marker for test to make future merges easier
      mysql-test/t/keywords.test:
        Added end marker for test to make future merges easier
      mysql-test/t/kill.test:
        Added end marker for test to make future merges easier
      mysql-test/t/limit.test:
        Added end marker for test to make future merges easier
      mysql-test/t/loaddata.test:
        Added end marker for test to make future merges easier
      mysql-test/t/lock.test:
        Added end marker for test to make future merges easier
      mysql-test/t/lock_multi.test:
        Added end marker for test to make future merges easier
      mysql-test/t/lock_tables_lost_commit.test:
        Added end marker for test to make future merges easier
      mysql-test/t/lowercase_table.test:
        Added end marker for test to make future merges easier
      mysql-test/t/lowercase_table2.test:
        Added end marker for test to make future merges easier
      mysql-test/t/lowercase_table3.test:
        Added end marker for test to make future merges easier
      mysql-test/t/lowercase_table_grant.test:
        Added end marker for test to make future merges easier
      mysql-test/t/lowercase_table_qcache.test:
        Added end marker for test to make future merges easier
      mysql-test/t/merge.test:
        Added end marker for test to make future merges easier
      mysql-test/t/metadata.test:
        Added end marker for test to make future merges easier
      mysql-test/t/mix_innodb_myisam_binlog.test:
        Added end marker for test to make future merges easier
      mysql-test/t/multi_statement.test:
        Added end marker for test to make future merges easier
      mysql-test/t/multi_update.test:
        Added end marker for test to make future merges easier
      mysql-test/t/myisam-blob.test:
        Added end marker for test to make future merges easier
      mysql-test/t/myisam.test:
        Added end marker for test to make future merges easier
      mysql-test/t/mysql_client_test.test:
        Added end marker for test to make future merges easier
      mysql-test/t/mysql_protocols.test:
        Added end marker for test to make future merges easier
      mysql-test/t/mysqlbinlog.test:
        Added end marker for test to make future merges easier
      mysql-test/t/mysqlbinlog2.test:
        Added end marker for test to make future merges easier
      mysql-test/t/mysqldump.test:
        Added end marker for test to make future merges easier
      mysql-test/t/mysqltest.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_alter_table.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_autodiscover.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_autodiscover2.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_basic.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_blob.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_cache.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_charset.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_config.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_database.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_grant.later:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_index.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_index_ordered.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_index_unique.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_insert.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_limit.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_lock.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_minmax.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_multi.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_replace.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_restore.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_subquery.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_transaction.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_truncate.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_types.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ndb_update.test:
        Added end marker for test to make future merges easier
      mysql-test/t/negation_elimination.test:
        Added end marker for test to make future merges easier
      mysql-test/t/not_embedded_server.test:
        Added end marker for test to make future merges easier
      mysql-test/t/null.test:
        Added end marker for test to make future merges easier
      mysql-test/t/null_key.test:
        Added end marker for test to make future merges easier
      mysql-test/t/odbc.test:
        Added end marker for test to make future merges easier
      mysql-test/t/olap.test:
        Added end marker for test to make future merges easier
      mysql-test/t/openssl_1.test:
        Added end marker for test to make future merges easier
      mysql-test/t/order_by.test:
        Added end marker for test to make future merges easier
      mysql-test/t/order_fill_sortbuf.test:
        Added end marker for test to make future merges easier
      mysql-test/t/outfile.test:
        Added end marker for test to make future merges easier
      mysql-test/t/overflow.test:
        Added end marker for test to make future merges easier
      mysql-test/t/packet.test:
        Added end marker for test to make future merges easier
      mysql-test/t/preload.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ps.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ps_10nestset.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ps_11bugs.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ps_1general.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ps_2myisam.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ps_3innodb.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ps_4heap.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ps_5merge.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ps_6bdb.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ps_7ndb.test:
        Added end marker for test to make future merges easier
      mysql-test/t/ps_grant.test:
        Added end marker for test to make future merges easier
      mysql-test/t/query_cache.test:
        Added end marker for test to make future merges easier
      mysql-test/t/query_cache_merge.test:
        Added end marker for test to make future merges easier
      mysql-test/t/raid.test:
        Added end marker for test to make future merges easier
      mysql-test/t/range.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rename.test:
        Added end marker for test to make future merges easier
      mysql-test/t/repair.test:
        Added end marker for test to make future merges easier
      mysql-test/t/replace.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rollback.test:
        Added end marker for test to make future merges easier
      mysql-test/t/row.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl000001.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl000002.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl000004.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl000005.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl000006.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl000008.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl000009.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl000010.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl000011.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl000012.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl000013.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl000015.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl000017.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl000018.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_EE_error.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_alter.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_chain_temp_table.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_change_master.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_charset.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_commit_after_flush.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_create_database.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_ddl.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_deadlock.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_delete_all.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_do_grant.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_drop.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_drop_temp.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_empty_master_crash.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_error_ignored_table.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_failed_optimize.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_failsafe.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_flush_log_loop.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_flush_tables.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_free_items.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_get_lock.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_heap.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_ignore_grant.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_init_slave.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_innodb.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_insert_id.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_insert_ignore.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_loaddata.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_loaddata_rule_m.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_loaddata_rule_s.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_loaddatalocal.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_log.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_log_pos.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_many_optimize.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_master_pos_wait.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_max_relay_size.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_misc_functions.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_multi_delete.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_multi_delete2.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_multi_query.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_multi_update.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_multi_update2.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_multi_update3.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_mystery22.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_openssl.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_optimize.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_ps.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_redirect.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_relayrotate.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_relayspace.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_replicate_do.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_reset_slave.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_rewrite_db.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_rotate_logs.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_server_id1.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_server_id2.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_set_charset.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_skip_error.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_sporadic_master.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_start_stop_slave.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_temporary.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_timezone.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_trunc_binlog.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_until.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_user_variables.test:
        Added end marker for test to make future merges easier
      mysql-test/t/rpl_variables.test:
        Added end marker for test to make future merges easier
      mysql-test/t/select.test:
        Added end marker for test to make future merges easier
      mysql-test/t/select_found.test:
        Added end marker for test to make future merges easier
      mysql-test/t/select_safe.test:
        Added end marker for test to make future merges easier
      mysql-test/t/show_check.test:
        Added end marker for test to make future merges easier
      mysql-test/t/skip_name_resolve.test:
        Added end marker for test to make future merges easier
      mysql-test/t/sql_mode.test:
        Added end marker for test to make future merges easier
      mysql-test/t/status.test:
        Added end marker for test to make future merges easier
      mysql-test/t/subselect.test:
        Added end marker for test to make future merges easier
      mysql-test/t/subselect2.test:
        Added end marker for test to make future merges easier
      mysql-test/t/subselect_gis.test:
        Added end marker for test to make future merges easier
      mysql-test/t/subselect_innodb.test:
        Added end marker for test to make future merges easier
      mysql-test/t/symlink.test:
        Added end marker for test to make future merges easier
      mysql-test/t/synchronization.test:
        Added end marker for test to make future merges easier
      mysql-test/t/system_mysql_db.test:
        Added end marker for test to make future merges easier
      mysql-test/t/system_mysql_db_fix.test:
        Added end marker for test to make future merges easier
      mysql-test/t/system_mysql_db_refs.test:
        Added end marker for test to make future merges easier
      mysql-test/t/tablelock.test:
        Added end marker for test to make future merges easier
      mysql-test/t/temp_table.test:
        Added end marker for test to make future merges easier
      mysql-test/t/timezone.test:
        Added end marker for test to make future merges easier
      mysql-test/t/timezone2.test:
        Added end marker for test to make future merges easier
      mysql-test/t/timezone3.test:
        Added end marker for test to make future merges easier
      mysql-test/t/timezone_grant.test:
        Added end marker for test to make future merges easier
      mysql-test/t/truncate.test:
        Added end marker for test to make future merges easier
      mysql-test/t/type_blob.test:
        Added end marker for test to make future merges easier
      mysql-test/t/type_date.test:
        Added end marker for test to make future merges easier
      mysql-test/t/type_datetime.test:
        Added end marker for test to make future merges easier
      mysql-test/t/type_decimal.test:
        Added end marker for test to make future merges easier
      mysql-test/t/type_enum.test:
        Added end marker for test to make future merges easier
      mysql-test/t/type_float.test:
        Added end marker for test to make future merges easier
      mysql-test/t/type_nchar.test:
        Added end marker for test to make future merges easier
      mysql-test/t/type_ranges.test:
        Added end marker for test to make future merges easier
      mysql-test/t/type_set.test:
        Added end marker for test to make future merges easier
      mysql-test/t/type_time.test:
        Added end marker for test to make future merges easier
      mysql-test/t/type_timestamp.test:
        Added end marker for test to make future merges easier
      mysql-test/t/type_uint.test:
        Added end marker for test to make future merges easier
      mysql-test/t/type_year.test:
        Added end marker for test to make future merges easier
      mysql-test/t/union.test:
        Added end marker for test to make future merges easier
      mysql-test/t/update.test:
        Added end marker for test to make future merges easier
      mysql-test/t/user_var-binlog.test:
        Added end marker for test to make future merges easier
      mysql-test/t/user_var.test:
        Added end marker for test to make future merges easier
      mysql-test/t/varbinary.test:
        Added end marker for test to make future merges easier
      mysql-test/t/variables.test:
        Added end marker for test to make future merges easier
      mysql-test/t/warnings.test:
        Added end marker for test to make future merges easier
      0062e643
  29. 16 Mar, 2005 1 commit
    • unknown's avatar
      WL#874 "Extended LOAD DATA". · fc573786
      unknown authored
      Now one can use user variables as target for data loaded from file
      (besides table's columns). Also LOAD DATA got new SET-clause in which
      one can specify values for table columns as expressions.
      
      For example the following is possible:
      LOAD DATA INFILE 'words.dat' INTO TABLE t1 (a, @b) SET c = @b + 1;
      
      This patch also implements new way of replicating LOAD DATA.
      Now we do it similarly to other queries.
      We store LOAD DATA query in new Execute_load_query event
      (which is last in the sequence of events representing LOAD DATA).
      When we are executing this event we simply rewrite part of query which
      holds name of file (we use name of temporary file) and then execute it
      as usual query. In the beggining of this sequence we use Begin_load_query
      event which is almost identical to Append_file event
      
      
      client/mysqlbinlog.cc:
        Added support of two new binary log events Begin_load_query_log_event and
        Execute_load_query_log_Event which are used to replicate LOAD DATA INFILE.
      mysql-test/r/ctype_ucs.result:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test's results and made it more robust for future similar 
        changes.
      mysql-test/r/insert_select.result:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test's results and made it more robust for future similar 
        changes.
      mysql-test/r/loaddata.result:
        Added tests for new LOAD DATA features.
      mysql-test/r/mix_innodb_myisam_binlog.result:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test's results (don't dare to get rid from binlog positions
        completely since it seems that this test uses them).
      mysql-test/r/mysqlbinlog.result:
        New approach for binlogging of LOAD DATA statement. Now we store it as
        usual query and rewrite part in which file is specified when needed.
        So now mysqlbinlog output for LOAD DATA much more closer to its initial
        form. Updated test'd results accordingly.
      mysql-test/r/mysqldump.result:
        Made test more robust to other tests failures.
      mysql-test/r/rpl000015.result:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test's results accordingly.
      mysql-test/r/rpl_change_master.result:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test's results.
      mysql-test/r/rpl_charset.result:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test's results accordingly
      mysql-test/r/rpl_deadlock.result:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test's results accordingly
      mysql-test/r/rpl_error_ignored_table.result:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test's results and made it more robust for future similar 
        changes.
      mysql-test/r/rpl_flush_log_loop.result:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test's results accordingly.
      mysql-test/r/rpl_flush_tables.result:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test's results and made it more robust for future similar 
        changes.
      mysql-test/r/rpl_loaddata.result:
        New way of replicating LOAD DATA. Now we do it similarly to other
        queries. We store LOAD DATA query in new Execute_load_query event
        (which is last in the sequence of events representing LOAD DATA).
        When we are executing this event we simply rewrite part of query which
        holds name of file (we use name of temporary file) and then execute it
        as usual query. In the beggining of this sequence we use Begin_load_query
        event which is almost identical to Append_file event...
        
        Updated test's results wwith new binlog positions.
      mysql-test/r/rpl_loaddata_rule_m.result:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test's results and made it more robust for future similar 
        changes.
        Since now LOAD DATA is replicated much in the same way as usual query
        --binlog_do/ignore_db work for it inthe same way as for usual queries.
      mysql-test/r/rpl_loaddata_rule_s.result:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test's results accordingly.
      mysql-test/r/rpl_loaddatalocal.result:
        Added nice test for case when it is important that LOAD DATA LOCAL
        ignores duplicates.
      mysql-test/r/rpl_log.result:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test's results accordingly (don't dare to get rid from binlog 
        positions completely since it seems that this test uses them).
      mysql-test/r/rpl_log_pos.result:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test's results accordingly.
      mysql-test/r/rpl_max_relay_size.result:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test's results accordingly.
      mysql-test/r/rpl_multi_query.result:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test's results accordingly.
      mysql-test/r/rpl_relayrotate.result:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test's results accordingly.
      mysql-test/r/rpl_replicate_do.result:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test's results accordingly.
      mysql-test/r/rpl_reset_slave.result:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test's results accordingly.
      mysql-test/r/rpl_rotate_logs.result:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test's results accordingly.
      mysql-test/r/rpl_server_id1.result:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test's results accordingly.
      mysql-test/r/rpl_server_id2.result:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test's results accordingly.
      mysql-test/r/rpl_temporary.result:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test's results and made it more robust for future similar 
        changes.
      mysql-test/r/rpl_timezone.result:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test's results and made it more robust for future similar 
        changes.
      mysql-test/r/rpl_until.result:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test's results accordingly and tweaked test a bit to bring it
        back to good shape.
      mysql-test/r/rpl_user_variables.result:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test's results and made it more robust for future similar 
        changes.
      mysql-test/r/user_var.result:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test's results and made it more robust for future similar 
        changes.
      mysql-test/t/ctype_ucs.test:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test accordingly and made it more robust for future similar
        changes.
      mysql-test/t/insert_select.test:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test accordingly and made it more robust for future similar
        changes.
      mysql-test/t/loaddata.test:
        Added test cases for new LOAD DATA functionality.
      mysql-test/t/mix_innodb_myisam_binlog.test:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test accordingly.
      mysql-test/t/mysqlbinlog.test:
        New way of replicating LOAD DATA local. Now we do it similarly to other
        queries. We store LOAD DATA query in new Execute_load_query event
        (which is last in the sequence of events representing LOAD DATA).
        When we are executing this event we simply rewrite part of query which
        holds name of file (we use name of temporary file) and then execute it
        as usual query. In the beggining of this sequence we use Begin_load_query
        event which is almost identical to Append_file event...
        
        Thus we need new binlog positions for LOAD DATA events.
      mysql-test/t/mysqlbinlog2.test:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test accordingly.
      mysql-test/t/mysqldump.test:
        Made test more robust for failures of other tests.
      mysql-test/t/rpl_charset.test:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test accordingly.
      mysql-test/t/rpl_deadlock.test:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test accordingly.
      mysql-test/t/rpl_error_ignored_table.test:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test accordingly and made it more robust for future similar
        changes.
      mysql-test/t/rpl_flush_tables.test:
        Addition of two new types of binary log events shifted binlog positions.
        Made test more robust for future similar changes.
      mysql-test/t/rpl_loaddata.test:
        New way of replicating LOAD DATA. Now we do it similarly to other
        queries. We store LOAD DATA query in new Execute_load_query event
        (which is last in the sequence of events representing LOAD DATA).
        When we are executing this event we simply rewrite part of query which
        holds name of file (we use name of temporary file) and then execute it
        as usual query. In the beggining of this sequence we use Begin_load_query
        event which is almost identical to Append_file event...
        
        Apropritely updated comments in test.
      mysql-test/t/rpl_loaddata_rule_m.test:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test accordingly and made it more robust for future similar 
        changes.
        Since now LOAD DATA is replicated much in the same way as usual query
        --binlog_do/ignore_db work for it inthe same way as for usual queries.
      mysql-test/t/rpl_loaddata_rule_s.test:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test accordingly.
      mysql-test/t/rpl_loaddatalocal.test:
        Added nice test for case when it is important that LOAD DATA LOCAL
        ignores duplicates.
      mysql-test/t/rpl_log.test:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test accordingly (don't dare to get rid from binlog positions
        completely since it seems that this test uses them).
      mysql-test/t/rpl_log_pos.test:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test accordingly.
      mysql-test/t/rpl_multi_query.test:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test accordingly.
      mysql-test/t/rpl_temporary.test:
        Addition of two new types of binary log events shifted binlog positions.
        Made test more robust for future similar changes.
      mysql-test/t/rpl_timezone.test:
        Addition of two new types of binary log events shifted binlog positions.
        Made test more robust for future similar changes.
      mysql-test/t/rpl_until.test:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test accordingly and tweaked it a bit to bring it back to good
        shape.
      mysql-test/t/rpl_user_variables.test:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test accordingly and made it more robust for future similar
        changes.
      mysql-test/t/user_var.test:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test accordingly and made it more robust for future similar
        changes.
      sql/item_func.cc:
        Added Item_user_var_as_out_param class that represents user variable
        which used as out parameter in LOAD DATA.
        
        Moved code from Item_func_set_user_var::update_hash() function to
        separate static function to be able to reuse it in this new class.
      sql/item_func.h:
        Added Item_user_var_as_out_param class that represents user variable
        which used as out parameter in LOAD DATA.
      sql/log_event.cc:
        New way of replicating LOAD DATA. Now we do it similarly to other
        queries. We store LOAD DATA query in new Execute_load_query event
        (which is last in the sequence of events representing LOAD DATA).
        When we are executing this event we simply rewrite part of query which
        holds name of file (we use name of temporary file) and then execute it
        as usual query. In the beggining of this sequence we use Begin_load_query
        event which is almost identical to Append_file event.
      sql/log_event.h:
        New way of replicating LOAD DATA. Now we do it similarly to other
        queries. We store LOAD DATA query in new Execute_load_query event
        (which is last in the sequence of events representing LOAD DATA).
        When we are executing this event we simply rewrite part of query which
        holds name of file (we use name of temporary file) and then execute it
        as usual query. In the beggining of this sequence we use Begin_load_query
        event which is almost identical to Append_file event.
      sql/mysql_priv.h:
        Now mysql_load() has two more arguments. They are needed to pass list of
        columns and corresponding expressions from new LOAD DATA's SET clause.
      sql/share/errmsg.txt:
        Added new error message which is used to forbid loading of data from
        fixed length rows to variables.
      sql/sql_lex.h:
        Added LEX::fname_start/fname_end members. 
        They are pointers to part of LOAD DATA statement which should be
        rewritten during replication (file name + little extra).
      sql/sql_load.cc:
        Added support for extended LOAD DATA. 
        Now one can use user variables as target for data loaded from file 
        (besides table's columns). Also LOAD DATA got new SET-clause in which
        one can specify values for table columns as expressions.
        
        Updated mysql_load()/read_fixed_length()/read_sep_field() to support
        this functionality (now they can read data from file to both columns and
        variables and assign do calculations and assignments specified in SET
        clause).
        
        We also use new approach for LOAD DATA binlogging/replication.
      sql/sql_parse.cc:
        mysql_execute_command():
          Since now we have SET clause in LOAD DATA we should also check
          permissions for tables used in its expressions. Also mysql_load()
          has two more arguments to pass information about this clause.
      sql/sql_repl.cc:
        New way of replicating LOAD DATA. Now we do it similarly to other
        queries. We store LOAD DATA query in new Execute_load_query event
        (which is last in the sequence of events representing LOAD DATA).
        When we are executing this event we simply rewrite part of query which
        holds name of file (we use name of temporary file) and then execute it
        as usual query. In the beggining of this sequence we use Begin_load_query
        event which is almost identical to Append_file event.
      sql/sql_repl.h:
        struct st_load_file_info:
          Removed memebers which are no longer needed for LOAD DATA binnlogging.
      sql/sql_yacc.yy:
        Added support for extended LOAD DATA syntax. Now one can use
        user variables as target for data loaded from file (besides table's 
        columns). Also LOAD DATA got new SET-clause in which one can specify
        values for table columns as expressions.
        
        For example the following is possible:
        LOAD DATA INFILE 'words.dat' INTO TABLE t1 (a, @b) SET c = @b + 1;
        
        Also now we save pointers to the beginning and to the end of part of 
        LOAD DATA statement which should be rewritten during replication.
      fc573786
  30. 16 Jan, 2005 1 commit
    • unknown's avatar
      XA (not completely polished out yet) · 63120ffe
      unknown authored
      include/my_pthread.h:
        cleanup. don't use gcc extensions
      innobase/include/trx0sys.ic:
        Jan's fix for innobase_xa_prepare
      innobase/read/read0read.c:
        Jan's fix for innobase_xa_prepare
      innobase/trx/trx0trx.c:
        Jan's fix for innobase_xa_prepare
      mysql-test/include/varchar.inc:
        test fix
      mysql-test/r/ctype_ucs.result:
        new log event - all binlog positions are changed :(
      mysql-test/r/drop_temp_table.result:
        new log event - all binlog positions are changed :(
      mysql-test/r/insert_select.result:
        new log event - all binlog positions are changed :(
      mysql-test/r/mix_innodb_myisam_binlog.result:
        new log event - all binlog positions are changed :(
      mysql-test/r/myisam.result:
        test fix
      mysql-test/r/rpl000015.result:
        new log event - all binlog positions are changed :(
      mysql-test/r/rpl_change_master.result:
        new log event - all binlog positions are changed :(
      mysql-test/r/rpl_charset.result:
        new log event - all binlog positions are changed :(
      mysql-test/r/rpl_error_ignored_table.result:
        new log event - all binlog positions are changed :(
      mysql-test/r/rpl_flush_log_loop.result:
        new log event - all binlog positions are changed :(
      mysql-test/r/rpl_flush_tables.result:
        new log event - all binlog positions are changed :(
      mysql-test/r/rpl_loaddata.result:
        new log event - all binlog positions are changed :(
      mysql-test/r/rpl_loaddata_rule_m.result:
        new log event - all binlog positions are changed :(
      mysql-test/r/rpl_loaddata_rule_s.result:
        new log event - all binlog positions are changed :(
      mysql-test/r/rpl_log.result:
        new log event - all binlog positions are changed :(
      mysql-test/r/rpl_log_pos.result:
        new log event - all binlog positions are changed :(
      mysql-test/r/rpl_max_relay_size.result:
        new log event - all binlog positions are changed :(
      mysql-test/r/rpl_relayrotate.result:
        new log event - all binlog positions are changed :(
      mysql-test/r/rpl_replicate_do.result:
        new log event - all binlog positions are changed :(
      mysql-test/r/rpl_reset_slave.result:
        new log event - all binlog positions are changed :(
      mysql-test/r/rpl_rotate_logs.result:
        new log event - all binlog positions are changed :(
      mysql-test/r/rpl_server_id1.result:
        new log event - all binlog positions are changed :(
      mysql-test/r/rpl_server_id2.result:
        new log event - all binlog positions are changed :(
      mysql-test/r/rpl_temporary.result:
        new log event - all binlog positions are changed :(
      mysql-test/r/rpl_timezone.result:
        new log event - all binlog positions are changed :(
      mysql-test/r/rpl_until.result:
        new log event - all binlog positions are changed :(
      mysql-test/r/rpl_user_variables.result:
        new log event - all binlog positions are changed :(
      mysql-test/r/user_var.result:
        new log event - all binlog positions are changed :(
      mysql-test/t/ctype_ucs.test:
        new log event - all binlog positions are changed :(
      mysql-test/t/mix_innodb_myisam_binlog.test:
        new log event - all binlog positions are changed :(
      mysql-test/t/mysqlbinlog.test:
        new log event - all binlog positions are changed :(
      mysql-test/t/mysqlbinlog2.test:
        new log event - all binlog positions are changed :(
      mysql-test/t/rpl_charset.test:
        new log event - all binlog positions are changed :(
      mysql-test/t/rpl_error_ignored_table.test:
        new log event - all binlog positions are changed :(
      mysql-test/t/rpl_loaddata_rule_m.test:
        new log event - all binlog positions are changed :(
      mysql-test/t/rpl_loaddata_rule_s.test:
        new log event - all binlog positions are changed :(
      mysql-test/t/rpl_log.test:
        new log event - all binlog positions are changed :(
      mysql-test/t/rpl_log_pos.test:
        new log event - all binlog positions are changed :(
      mysql-test/t/rpl_user_variables.test:
        new log event - all binlog positions are changed :(
      mysql-test/t/user_var.test:
        new log event - all binlog positions are changed :(
      mysys/hash.c:
        typo fixed
      sql/ha_berkeley.cc:
        handlerton framework
      sql/ha_berkeley.h:
        handlerton framework
      sql/ha_innodb.cc:
        handlerton framework
      sql/ha_innodb.h:
        handlerton framework
      sql/handler.cc:
        new transaction handling, handlerton framework, two-phase commit, XA support
      sql/handler.h:
        new transaction handling, handlerton framework, two-phase commit, XA support
      sql/lex.h:
        XA commands
      sql/log.cc:
        new transaction handling, handlerton framework, two-phase commit,
        XA support, tc-logging, TC_LOG_MMAP class
      sql/log_event.cc:
        Xid_log_event
      sql/log_event.h:
        Xid_log_event, LOG_EVENT_BINLOG_CLOSED_F flag
      sql/mysql_priv.h:
        wrapper for query_id++
      sql/mysqld.cc:
        new command-line options --log-tc, --log-tc-size, --tc-heuristic-recover,
        new status variables Tc_log_page_size, Tc_log_max_pages_used, Tc_log_page_waits.
        init/stop tc logging
      sql/set_var.h:
        warning fixed
      sql/share/errmsg.txt:
        XA error messages
      sql/sp_head.cc:
        s/query_id++/next_query_id()/
      sql/sql_base.cc:
        typo fixed. new transaction handling.
      sql/sql_class.cc:
        cleanup of THD.transaction
      sql/sql_class.h:
        TC_LOG classes, new status variables, new savepoint handling, XA support
      sql/sql_insert.cc:
        comments
      sql/sql_lex.cc:
        s/found_colon/found_semicolon/
      sql/sql_lex.h:
        SQLCOM_XA_xxx, XA related changes in Lex
      sql/sql_parse.cc:
        cleanup, XA commands, new savepoint handling
      sql/sql_repl.cc:
        two functions moved to log.cc
      sql/sql_repl.h:
        two functions moved to log.cc
      sql/sql_trigger.cc:
        s/lex.name_and_length/lex.ident/
      sql/sql_yacc.yy:
        XA commands, cleanup
      63120ffe
  31. 10 May, 2004 1 commit
    • unknown's avatar
      Fix replace_result of $MASTER_MYPORT instead of literal numbers. · 74e20285
      unknown authored
      mysql-test/t/rpl000015.test:
        Fix replace_result of $MASTER_MYPORT instead of literal numbers.
        The test case rpl000015 needs one exlpicit literal number.
        It changes partial master settings, which seems to reset other settings
        to their defaults. To test this is obviously the intent of this case.
      74e20285
  32. 16 Feb, 2004 1 commit
    • unknown's avatar
      Changed wellformedlen to well_formed_len · f9976eb1
      unknown authored
      Fixed that blobs >16M can be inserted/updated
      Fixed bug when doing CREATE TEMPORARY TABLE ... LIKE
      
      
      include/m_ctype.h:
        Changed wellformedlen to well_formed_len
      include/mysql.h:
        Fixed comment
      libmysql/libmysql.c:
        Fixed indentation
      libmysqld/lib_sql.cc:
        Fixed indentation
      mysql-test/r/ctype_utf8.result:
        updated warning numbers
      mysql-test/r/innodb.result:
        Moved test to right place
      mysql-test/r/myisam-blob.result:
        More test for blobs
      mysql-test/r/rpl000002.result:
        Move test to better place
      mysql-test/r/rpl_log.result:
        Move test to better place
      mysql-test/r/union.result:
        Move test to better place
      mysql-test/t/innodb.test:
        Moved test to right place
      mysql-test/t/myisam-blob.test:
        More test of blobs
      mysql-test/t/rpl000002.test:
        Move test to better place
      mysql-test/t/rpl_log.test:
        Move test to better place
      mysql-test/t/union.test:
        Move test to better place
      sql/field.cc:
        Changed wellformedlen to well_formed_len.
        Fixed that blobs >16M can be inserted/updated (new bug)
      sql/field.h:
        Code optimization
      sql/sql_lex.cc:
        Changed short variable names
      sql/sql_show.cc:
        Optimized quote handling
      sql/sql_table.cc:
        Fixed bug when doing CREATE TEMPORARY TABLE ... LIKE
      sql/sql_union.cc:
        Added comment
      strings/ctype-big5.c:
        Changed wellformedlen to well_formed_len
      strings/ctype-bin.c:
        Changed wellformedlen to well_formed_len
      strings/ctype-euc_kr.c:
        Changed wellformedlen to well_formed_len
      strings/ctype-gb2312.c:
        Changed wellformedlen to well_formed_len
      strings/ctype-gbk.c:
        Changed wellformedlen to well_formed_len
      strings/ctype-latin1.c:
        Changed wellformedlen to well_formed_len
      strings/ctype-mb.c:
        Changed wellformedlen to well_formed_len
      strings/ctype-simple.c:
        Changed wellformedlen to well_formed_len
      strings/ctype-sjis.c:
        Changed wellformedlen to well_formed_len
      strings/ctype-tis620.c:
        Changed wellformedlen to well_formed_len
      strings/ctype-ucs2.c:
        Changed wellformedlen to well_formed_len
        Indentation changes
      strings/ctype-ujis.c:
        Changed wellformedlen to well_formed_len
      strings/ctype-utf8.c:
        Changed wellformedlen to well_formed_len
      f9976eb1
  33. 02 Feb, 2004 1 commit
    • unknown's avatar
      rpl_log.result: · 32363f8d
      unknown authored
        a result file for a fix for bug #2557
      rpl_log.test:
        A test case for a fix for bug #2557
      
      
      mysql-test/t/rpl_log.test:
        A test case for a fix for bug #2557
      mysql-test/r/rpl_log.result:
        a result file for a fix for bug #2557
      32363f8d
  34. 19 Dec, 2003 1 commit
    • unknown's avatar
      This is the final commit for Worklog tasks: · 309cbc54
      unknown authored
         * A more dynamic binlog format which allows small changes (1064)
         * Log session variables in Query_log_event (1063)
      It contains a few bugfixes (which I made when running the testsuite).
      I carefully updated the results of the testsuite (i.e. I checked for every one,
      if the difference between .reject and .result could be explained).
      Apparently mysql-test-run --manager is broken in 4.1 and 5.0 currently,
      so I could neither run the few tests which require --manager, nor check
      that they pass nor modify their .result. But for builds, we don't run
      with --manager.
      Apart from --manager, the full testsuite passes, with Valgrind too (no errors).
      I'm going to push in the next minutes. Remains: update the manual.
      Note: by chance I saw that (in 4.1, in 5.0) rpl_get_lock fails when run alone;
      this is normal at it makes assumptions on thread ids. I will fix this one day
      in 4.1.
      
      
      mysql-test/r/rpl000015.result:
        result update
      mysql-test/r/rpl_change_master.result:
        result update
      mysql-test/r/rpl_error_ignored_table.result:
        result update
      mysql-test/r/rpl_flush_log_loop.result:
        result update
      mysql-test/r/rpl_flush_tables.result:
        result update
      mysql-test/r/rpl_loaddata.result:
        result update
      mysql-test/r/rpl_loaddata_rule_m.result:
        result update
      mysql-test/r/rpl_loaddata_rule_s.result:
        result update
      mysql-test/r/rpl_log.result:
        result update
      mysql-test/r/rpl_log_pos.result:
        result update
      mysql-test/r/rpl_max_relay_size.result:
        result update
      mysql-test/r/rpl_relayrotate.result:
        result update
      mysql-test/r/rpl_replicate_do.result:
        result update
      mysql-test/r/rpl_reset_slave.result:
        result update
      mysql-test/r/rpl_rotate_logs.result:
        result update
      mysql-test/r/rpl_session_var.result:
        result update
      mysql-test/r/rpl_temporary.result:
        result update
      mysql-test/r/rpl_trunc_binlog.result:
        result update
      mysql-test/r/rpl_until.result:
        result update
      mysql-test/r/rpl_user_variables.result:
        result update
      mysql-test/t/rpl000010-slave.opt:
        need to wait 2 events, because now we receive a Format_desc on top of the Rotate,
        when replication starts.
      mysql-test/t/rpl000015.test:
        relay log information is not repeatable in general (if a reconnection
        happens because --sleep=10 for example), so we hide these columns.
      mysql-test/t/rpl_change_master.test:
        relay log information is not repeatable in general (if a reconnection
        happens because --sleep=10 for example), so we hide these columns.
      mysql-test/t/rpl_empty_master_crash.test:
        relay log information is not repeatable in general (if a reconnection
        happens because --sleep=10 for example), so we hide these columns.
      mysql-test/t/rpl_error_ignored_table.test:
        relay log information is not repeatable in general (if a reconnection
        happens because --sleep=10 for example), so we hide these columns.
      mysql-test/t/rpl_flush_log_loop.test:
        relay log information is not repeatable in general (if a reconnection
        happens because --sleep=10 for example), so we hide these columns.
      mysql-test/t/rpl_loaddata.test:
        position update
      mysql-test/t/rpl_loaddata_rule_m.test:
        position update
      mysql-test/t/rpl_loaddata_rule_s.test:
        position update
      mysql-test/t/rpl_log.test:
        position update
      mysql-test/t/rpl_log_pos.test:
        position update
      mysql-test/t/rpl_max_relay_size.test:
        relay log information is not repeatable in general (if a reconnection
        happens because --sleep=10 for example), so we hide these columns.
      mysql-test/t/rpl_openssl.test:
        relay log information is not repeatable in general (if a reconnection
        happens because --sleep=10 for example), so we hide these columns.
      mysql-test/t/rpl_redirect.test:
        relay log information is not repeatable in general (if a reconnection
        happens because --sleep=10 for example), so we hide these columns.
      mysql-test/t/rpl_relayrotate-slave.opt:
        better options for this test
      mysql-test/t/rpl_relayrotate.test:
        using max() is better for debugging (it shows at which place the slave
        SQL thread resumed)
      mysql-test/t/rpl_replicate_do.test:
        relay log information is not repeatable in general (if a reconnection
        happens because --sleep=10 for example), so we hide these columns.
      mysql-test/t/rpl_reset_slave.test:
        relay log information is not repeatable in general (if a reconnection
        happens because --sleep=10 for example), so we hide these columns.
      mysql-test/t/rpl_rotate_logs.test:
        relay log information is not repeatable in general (if a reconnection
        happens because --sleep=10 for example), so we hide these columns.
      mysql-test/t/rpl_session_var.test:
        100 because password() is longer than 10 chars
      mysql-test/t/rpl_trunc_binlog.test:
        relay log information is not repeatable in general (if a reconnection
        happens because --sleep=10 for example), so we hide these columns.
      mysql-test/t/rpl_until.test:
        position update
      mysql-test/t/rpl_user_variables.test:
        position update
      sql/log.cc:
        Ensure that the Format_desc propagated on next relay logs does not trigger
        undue actions (like incrementing some positions or clearing some files).
      sql/log_event.cc:
        * When the slave SQL thread finds a Rotate/Format_desc/Stop in the middle of
        a transaction (then these were written by the slave itself to its relay log),
        it should not increment rli->group* variables, but only rli->event* ones.
        * When the slave SQL thread finds a Format_desc not to be ignored (not
        the same server id as the slave's), if it has log_pos==0 it must not trigger
        "unfinished transaction in master's binlog" (log_pos==0 is always a marker
        in the relay log to mean "this event was not at this place in the master's
        binlog": it's for fake Rotate events, and for Format_description events which the master had
        to send us for replication to start).
        * In the Query_log_event on disk, catalog is now terminated by '\0'.
        * thd->catalog must be set to 0 when some exec_event() terminate (otherwise
        double free).
      sql/slave.cc:
        * Fixes for a few bugs when ignoring events in the slave SQL thread:
          - do not decrement rli->slave_skip_counter if the event is an event
          related to the binlog or relay log itself (FORMAT_DESCRIPTION,
          ROTATE, STOP) because these events should never be skipped (or the slave
          will be confused). Usually the user wants to skip a query, not a Rotate... 
          - when we (re)connect to the master, we must free description_event_for_queue
          (otherwise memory leak when we reconnect). 
        * Changed a bit the code where we change description_event_for_queue,
        to make it look "safer".
        * Moved 'created=0' to log.cc where it is safer.
        * When the slave SQL thread finds a Rotate/Format_desc/Stop in the middle of
        a transaction (then these were written by the slave itself to its relay log),
        it should not increment rli->group* variables, but only rli->event* ones.
      sql/sql_class.h:
        a warning comment
      sql/sql_repl.cc:
        A mistake: I had passed a char* instead of char**
      309cbc54
  35. 09 Oct, 2003 1 commit
    • unknown's avatar
      Don't show Slave_IO_State in the testsuite (replace it with #) because it can't be predicted. · 72319047
      unknown authored
      I manually edited rpl_openssl.result because the test is skipped on my
      machine. Hope it's correct.
      
      
      mysql-test/r/rpl000015.result:
        Don't show Slave_IO_State because it can't be predicted.
      mysql-test/r/rpl_error_ignored_table.result:
        Don't show Slave_IO_State because it can't be predicted.
      mysql-test/r/rpl_flush_log_loop.result:
        Don't show Slave_IO_State because it can't be predicted.
      mysql-test/r/rpl_loaddata.result:
        Don't show Slave_IO_State because it can't be predicted.
      mysql-test/r/rpl_log.result:
        Don't show Slave_IO_State because it can't be predicted.
      mysql-test/r/rpl_log_pos.result:
        Don't show Slave_IO_State because it can't be predicted.
      mysql-test/r/rpl_max_relay_size.result:
        Don't show Slave_IO_State because it can't be predicted.
      mysql-test/r/rpl_openssl.result:
        Don't show Slave_IO_State because it can't be predicted.
      mysql-test/r/rpl_replicate_do.result:
        Don't show Slave_IO_State because it can't be predicted.
      mysql-test/r/rpl_reset_slave.result:
        Don't show Slave_IO_State because it can't be predicted.
      mysql-test/r/rpl_rotate_logs.result:
        Don't show Slave_IO_State because it can't be predicted.
      mysql-test/r/rpl_trunc_binlog.result:
        Don't show Slave_IO_State because it can't be predicted.
      mysql-test/r/rpl_until.result:
        Don't show Slave_IO_State because it can't be predicted.
      mysql-test/t/rpl000015.test:
        Don't show Slave_IO_State because it can't be predicted.
      mysql-test/t/rpl_empty_master_crash.test:
        Don't show Slave_IO_State because it can't be predicted.
      mysql-test/t/rpl_error_ignored_table.test:
        Don't show Slave_IO_State because it can't be predicted.
      mysql-test/t/rpl_flush_log_loop.test:
        Don't show Slave_IO_State because it can't be predicted.
      mysql-test/t/rpl_loaddata.test:
        Don't show Slave_IO_State because it can't be predicted.
      mysql-test/t/rpl_log.test:
        Don't show Slave_IO_State because it can't be predicted.
      mysql-test/t/rpl_log_pos.test:
        Don't show Slave_IO_State because it can't be predicted.
      mysql-test/t/rpl_max_relay_size.test:
        Don't show Slave_IO_State because it can't be predicted.
      mysql-test/t/rpl_openssl.test:
        Don't show Slave_IO_State because it can't be predicted.
      mysql-test/t/rpl_redirect.test:
        Don't show Slave_IO_State because it can't be predicted.
      mysql-test/t/rpl_replicate_do.test:
        Don't show Slave_IO_State because it can't be predicted.
      mysql-test/t/rpl_reset_slave.test:
        Don't show Slave_IO_State because it can't be predicted.
      mysql-test/t/rpl_rotate_logs.test:
        Don't show Slave_IO_State because it can't be predicted.
      mysql-test/t/rpl_trunc_binlog.test:
        Don't show Slave_IO_State because it can't be predicted.
      mysql-test/t/rpl_until.test:
        Don't show Slave_IO_State because it can't be predicted.
      72319047
  36. 08 Oct, 2003 1 commit
    • unknown's avatar
      Final push for WL#1098: · 52d4f219
      unknown authored
      "Add a column "Timestamp_of_last_master_event_executed" in SHOW SLAVE STATUS".
      Finally this is adding
      - Slave_IO_State (a copy of the State column of SHOW PROCESSLIST for the I/O thread,
      so that the users, most of the time, has enough info with only SHOW SLAVE STATUS).
      - Seconds_behind_master. When the slave connects to the master it does SELECT UNIX_TIMESTAMP()
      on the master, computes the absolute difference between the master's and the slave's clock.
      It records the timestamp of the last event executed by the SQL thread, and does a
      small computation to find the number of seconds by which the slave is late.
      
      
      mysql-test/r/rpl000015.result:
        result update
      mysql-test/r/rpl_empty_master_crash.result:
        result update
      mysql-test/r/rpl_error_ignored_table.result:
        result update
      mysql-test/r/rpl_flush_log_loop.result:
        result update
      mysql-test/r/rpl_loaddata.result:
        result update
      mysql-test/r/rpl_log.result:
        result update
      mysql-test/r/rpl_log_pos.result:
        result update
      mysql-test/r/rpl_max_relay_size.result:
        result update
      mysql-test/r/rpl_redirect.result:
        result update
      mysql-test/r/rpl_replicate_do.result:
        result update
      mysql-test/r/rpl_reset_slave.result:
        result update
      mysql-test/r/rpl_rotate_logs.result:
        result update
      mysql-test/r/rpl_trunc_binlog.result:
        result update
      mysql-test/r/rpl_until.result:
        result update
      mysql-test/t/rpl000015.test:
        update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
      mysql-test/t/rpl_empty_master_crash.test:
        update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
      mysql-test/t/rpl_error_ignored_table.test:
        update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
      mysql-test/t/rpl_flush_log_loop.test:
        update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
      mysql-test/t/rpl_loaddata.test:
        update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
      mysql-test/t/rpl_log.test:
        update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
      mysql-test/t/rpl_log_pos.test:
        update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
      mysql-test/t/rpl_max_relay_size.test:
        update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
      mysql-test/t/rpl_openssl.test:
        update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
      mysql-test/t/rpl_redirect.test:
        update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
      mysql-test/t/rpl_replicate_do.test:
        update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
      mysql-test/t/rpl_reset_slave.test:
        update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
      mysql-test/t/rpl_rotate_logs.test:
        update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
      mysql-test/t/rpl_trunc_binlog.test:
        update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
      mysql-test/t/rpl_until.test:
        update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
      sql/log_event.cc:
        when the SQL thread executes an event, we record its timestamp
      sql/slave.cc:
        in check_master_version() we know read the master's clock, to know the clock difference
        with the slave.
        In show_master_info() we send the state of the I/O thread, and compute the number of
        seconds by which the slave is late.
      sql/slave.h:
        timestamp of the last master's event executed by the SQL thread,
        and difference between the clocks of the master and slave.
      sql/sql_repl.cc:
        clear the Seconds_behind_master column of SHOW SLAVE STATUS when RESET SLAVE or CHANGE MASTER.
      52d4f219