1. 31 Jan, 2008 1 commit
    • unknown's avatar
      Test case for bug#12691 · 6a873248
      unknown authored
      
      mysql-test/suite/bugs/data/rpl_bug12691.dat:
        Data file for test case
      mysql-test/suite/bugs/r/rpl_bug12691.result:
        Result file
      6a873248
  2. 30 Jan, 2008 5 commits
    • unknown's avatar
      Merge riska.(none):/home/sven/bktip/5.1-new-rpl · 360bd365
      unknown authored
      into  riska.(none):/home/sven/bk/b32434-version_replication/5.1-new-rpl
      
      
      sql/log_event.cc:
        Auto merged
      360bd365
    • unknown's avatar
      Fixing return value. · b0283afb
      unknown authored
      
      sql/item_cmpfunc.cc:
        Minor fix to return correct value in case of error.
      sql/rpl_utility.cc:
        Minor fix to return correct value in case of error.
      b0283afb
    • unknown's avatar
      Post-merge changes. · 101c30cc
      unknown authored
      
      BitKeeper/deleted/.del-show_binlog_events2.inc:
        Delete: mysql-test/include/show_binlog_events2.inc
      client/mysqlbinlog.cc:
        char -> uchar for raw memory.
      sql/item_cmpfunc.cc:
        Adding cast to remove warning when converting negative integer
        to unsigned type.
      sql/log_event.cc:
        char -> uchar for raw memory.
      sql/log_event.h:
        char -> uchar for raw memory.
      sql/rpl_utility.cc:
        Adding cast to remove warning when converting negative integer
        to unsigned type.
      sql/slave.cc:
        char -> uchar for raw memory.
      sql/sql_repl.cc:
        char -> uchar for raw memory.
      sql-common/client.c:
        char -> uchar for raw memory.
      101c30cc
    • unknown's avatar
      Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl · 817bfa35
      unknown authored
      into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
      
      
      sql/sql_parse.cc:
        Auto merged
      include/my_sys.h:
        Manual merge
      mysql-test/suite/rpl/r/rpl_grant.result:
        Manual merge
      sql/sql_acl.cc:
        Manual merge
      sql/sql_repl.cc:
        Manual merge
      817bfa35
    • unknown's avatar
      Merge zhe@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl · 7faa7d60
      unknown authored
      into  mail.hezx.com:/media/sda3/work/mysql/bkwork/bug26489_corruption_in_relay_log/5.0
      
      
      7faa7d60
  3. 29 Jan, 2008 3 commits
    • unknown's avatar
      BUG#32434: Replication doesn't work between 5.2.1-a_drop6p9-log and 5.1.22-ndb-6.3.6-telco · 37513aa5
      unknown authored
      Problem: When slave reads format_description_log_event, it checks if the
      master is a version that uses an old binlog format. See also BUG#27779.
      Not all possible server_versions were listed.
      Fix: Check for all server_versions which use the old binlog_format.
      
      
      sql/log_event.cc:
        In the place where we check if server_version indicates that master is
        the alcatel branch, we now check all currently possible alcatel versions,
        not just a subset. Added comment to explain which clones are affected.
      37513aa5
    • unknown's avatar
      update test result · 6766554f
      unknown authored
      
      mysql-test/r/rpl_grant.result:
        update result
      6766554f
    • unknown's avatar
      BUG#26489 Corruption in relay logs · 5a039fa2
      unknown authored
      Here is the scenario that causes the failure.(by Mats)
      
      1. The to-be corrupt log event (let's call it X), is split into two
         packets B and C on the network level (net_write_buff()). The parts
         are X = (x',x''). The part x' ends up in packet B and part x''
         ends up in packet C. Prior to the corrupt event X, the event Y has
         been written successfully, but has been split into two packets as
         well, which we call (y',y'').
      2. The master sends packet A = (y'',x') to the slave, increases the
         packet sequence number, the slave receives the packet, but fails
         to reply before the master gets a timeout.
      3. Since the master got a timeout, it reports failure, and aborts
         sending the binary log by exiting mysql_binlog_send(). However, it
         leaves the buffer intact, still holding y'' (but not x', since the
         write_pos is not increased).
      4. After exiting mysql_binlog_send(), the master does a
         disconnection of the client thread, which involves sending an
         error message e to the client (i.e., the slave).
      5. In this case, net_write_buff() is used again, but this time the
         old contents of the packet is used so that the new packet is
         D = (y'',e). Note that this will use a new packet sequence number,
         since the packet number was increased in step 2.
      6. The slave receives the tail y'' of the Y log event, concatenates
         this with x' (which it already received), and writes the event
         (x',y'') it to the relay log since it hasn't noticed anything is
         amiss.
      7. It then tries to read more bytes, which is either e (if the length
         given for X just happened to match the length given for Y, or just
         plain garbage because the slave is out of sync with what is
         actually sent.
      8. After a while, the SQL thread tries to execute the event (x',y''),
         which is very likely to be just nonsense.
      
      The problem can be fixed by not resetting net->error after the call of 
      mysql_binlog_send, so the error message will not be sent and the connection
      will be closed.
      
      
      sql/sql_parse.cc:
        Do not reset net->error, if net->error == 2, we should not try to use the connection again
      5a039fa2
  4. 25 Jan, 2008 1 commit
    • unknown's avatar
      BUG#33862 completely failed DROP USER statement gets replicated · d2b4d051
      unknown authored
      The problem is when create/rename/drop users, the statement was logged regardless of error, even if no data has been changed, the statement was logged.
      
      After this patch, create/rename/drop users don't write the binlog if the statement makes no changes, if the statement does make any changes, log the statement with possible error code.
      
      This patch is based on the patch for BUG#29749, which is not pushed
      
      
      sql/sql_acl.cc:
        when create/rename/drop users, don't write the binlog if the statement make no changes
      mysql-test/r/rpl_user.result:
        New BitKeeper file ``mysql-test/r/rpl_user.result''
      mysql-test/t/rpl_user.test:
        New BitKeeper file ``mysql-test/t/rpl_user.test''
      d2b4d051
  5. 22 Jan, 2008 1 commit
    • unknown's avatar
      fix test failure · 5efbdc90
      unknown authored
      
      mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
        Remove unnecessary show master status, and replace the rest with show binlog events for checking
      mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result:
        update result
      mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
        update result
      5efbdc90
  6. 21 Jan, 2008 2 commits
    • unknown's avatar
      fix failed tests · a300bd53
      unknown authored
      
      mysql-test/extra/binlog_tests/blackhole.test:
        mask out file_id
      mysql-test/extra/binlog_tests/mix_innodb_myisam_side_effects.test:
        remove unnecessary show master status
      mysql-test/suite/binlog/r/binlog_stm_blackhole.result:
        mask out file_id
      mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
        remove unnecessary show master status
      a300bd53
    • unknown's avatar
      Merge mail.hezx.com:/media/sda3/work/mysql/bkwork/bug#32205/5.0 · dd478403
      unknown authored
      into  mail.hezx.com:/media/sda3/work/mysql/bkwork/bug#32205/5.1
      
      
      BitKeeper/deleted/.del-binlog_start_comment.result:
        Auto merged
      BitKeeper/deleted/.del-binlog_start_comment.test:
        Auto merged
      mysql-test/extra/binlog_tests/blackhole.test:
        Manual merge
      mysql-test/r/case.result:
        Manual merge
      mysql-test/r/mysqlbinlog2.result:
        Manual merge
      mysql-test/suite/binlog/r/binlog_stm_blackhole.result:
        Manual merge
      mysql-test/t/case.test:
        Manual merge
      dd478403
  7. 15 Jan, 2008 1 commit
  8. 14 Jan, 2008 5 commits
    • unknown's avatar
      Merge riska.(none):/home/sven/bkgca/5.1-new-rpl · 9a2c03f1
      unknown authored
      into  riska.(none):/home/sven/bk/b27779-old_row_events/5.1-new-rpl
      
      
      sql/log_event.cc:
        Auto merged
      9a2c03f1
    • unknown's avatar
      Merge mail.hezx.com:/media/sda3/work/mysql/bkwork/versional/mysql-5.1-new-rpl · 88630e74
      unknown authored
      into  mail.hezx.com:/media/sda3/work/mysql/bkwork/versional/merge-51
      
      
      mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
        mask error message in show slave status
      88630e74
    • unknown's avatar
      fix for versional test · c7ff3942
      unknown authored
      
      mysql-test/extra/rpl_tests/rpl_row_tabledefs.test:
        Mask out error messages
      mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
        Mask out Error messages in reslut of show slave status
      mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
        Mask out Error messages in reslut of show slave status
      mysql-test/suite/rpl/t/rpl_temporary_errors.test:
        mask out binlog position
      c7ff3942
    • unknown's avatar
      Merge mail.hezx.com:/media/sda3/work/mysql/bkwork/versional/mysql-5.1-new-rpl · 6c8a7feb
      unknown authored
      into  mail.hezx.com:/media/sda3/work/mysql/bkwork/versional/merge-51
      
      
      mysql-test/suite/rpl/r/rpl_create_database.result:
        Auto merged
      mysql-test/suite/rpl/r/rpl_load_from_master.result:
        Auto merged
      mysql-test/suite/rpl/t/rpl_create_database.test:
        Auto merged
      mysql-test/suite/rpl/t/rpl_load_from_master.test:
        Auto merged
      mysql-test/suite/rpl/r/rpl_init_slave.result:
        SCCS merged
      mysql-test/suite/rpl/t/rpl_init_slave.test:
        SCCS merged
      6c8a7feb
    • unknown's avatar
      Fix for versional test · 32a77ed6
      unknown authored
      Mask binlog positions, error, warning and other information that are not significant for the test
      
      
      mysql-test/extra/rpl_tests/rpl_max_relay_size.test:
        Mask out binlog position and DBs in result of show master status
      mysql-test/extra/rpl_tests/rpl_reset_slave.test:
        Mask out log positions in tests to make them version independent
      mysql-test/extra/rpl_tests/rpl_row_tabledefs.test:
        Mask out Error messages in reslut of show slave status
      mysql-test/suite/rpl/r/rpl_000015.result:
        Mask out log positions in tests to make them version independent
        ---
        Mask out binlog position and DBs in result of show master status
      mysql-test/suite/rpl/r/rpl_change_master.result:
        Mask out log positions in tests to make them version independent
      mysql-test/suite/rpl/r/rpl_create_database.result:
        fix for versional test
      mysql-test/suite/rpl/r/rpl_grant.result:
        fix for versional test
      mysql-test/suite/rpl/r/rpl_init_slave.result:
        fix for versional test
      mysql-test/suite/rpl/r/rpl_load_from_master.result:
        update result
      mysql-test/suite/rpl/r/rpl_log_pos.result:
        Mask out binlog position and DBs in result of show master status
      mysql-test/suite/rpl/r/rpl_rotate_logs.result:
        Mask out binlog position and DBs in result of show master status
      mysql-test/suite/rpl/r/rpl_row_max_relay_size.result:
        Mask out binlog position and DBs in result of show master status
      mysql-test/suite/rpl/r/rpl_row_reset_slave.result:
        Mask out log positions in tests to make them version independent
      mysql-test/suite/rpl/r/rpl_skip_error.result:
        Mask out log positions in tests to make them version independent
      mysql-test/suite/rpl/r/rpl_stm_max_relay_size.result:
        Mask out log positions in tests to make them version independent
        ---
        Mask out binlog position and DBs in result of show master status
      mysql-test/suite/rpl/r/rpl_stm_reset_slave.result:
        Mask out log positions in tests to make them version independent
      mysql-test/suite/rpl/r/rpl_stm_until.result:
        Mask out log positions in tests to make them version independent
      mysql-test/suite/rpl/r/rpl_temporary_errors.result:
        Mask out binlog positions
      mysql-test/suite/rpl/t/rpl_000015.test:
        Mask out log positions in tests to make them version independent
      mysql-test/suite/rpl/t/rpl_change_master.test:
        Mask out log positions in tests to make them version independent
      mysql-test/suite/rpl/t/rpl_colSize.test:
        fix for versional test
      mysql-test/suite/rpl/t/rpl_create_database.test:
        fix for versional test
      mysql-test/suite/rpl/t/rpl_grant.test:
        fix for versional test
      mysql-test/suite/rpl/t/rpl_init_slave.test:
        fix for versional test
      mysql-test/suite/rpl/t/rpl_load_from_master.test:
        fix for versional test
      mysql-test/suite/rpl/t/rpl_log_pos.test:
        Mask out binlog position and DBs
      mysql-test/suite/rpl/t/rpl_rotate_logs.test:
        Mask out log positions in tests to make them version independent
      mysql-test/suite/rpl/t/rpl_skip_error.test:
        Mask out log positions in tests to make them version independent
      mysql-test/suite/rpl/t/rpl_stm_until.test:
        Mask out log positions in tests to make them version independent
      mysql-test/include/show_binary_logs.inc:
        Mask out log positions in tests to make them version independent
      mysql-test/include/show_master_logs.inc:
        Mask out log positions in tests to make them version independent
      mysql-test/include/show_master_status.inc:
        Mask out log positions in tests to make them version independent
        ---
        Mask out binlog position and DBs in result of show master status
      mysql-test/include/show_slave_status2.inc:
        Mask out log positions in tests to make them version independent
      32a77ed6
  9. 11 Jan, 2008 3 commits
    • unknown's avatar
      Fixing failing test case. · 887cf4ec
      unknown authored
      
      mysql-test/suite/rpl/r/rpl_init_slave.result:
        Result change.
      mysql-test/suite/rpl/t/rpl_init_slave.test:
        Starting and stopping slave to make sure that the init_slave
        variable is executed.
      887cf4ec
    • unknown's avatar
      Post-merge changes to make tests pass. · 01c2de40
      unknown authored
      
      BitKeeper/deleted/.del-binlog_start_comment.test:
        Delete: mysql-test/t/binlog_start_comment.test
      BitKeeper/deleted/.del-binlog_start_comment.result:
        Delete: mysql-test/r/binlog_start_comment.result
      mysql-test/suite/binlog/t/binlog_unsafe.test:
        Rename: mysql-test/t/binlog_unsafe.test -> mysql-test/suite/binlog/t/binlog_unsafe.test
      mysql-test/suite/binlog/r/binlog_unsafe.result:
        Rename: mysql-test/r/binlog_unsafe.result -> mysql-test/suite/binlog/r/binlog_unsafe.result
      mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
        Result change.
      mysql-test/suite/rpl/r/rpl_timezone.result:
        Result change.
      mysql-test/suite/rpl/t/rpl_row_sp005.test:
        Adding missing sync with master causing test to fail.
      01c2de40
    • unknown's avatar
      Post-merge fixes to make binlog test suite pass. · c06d3d70
      unknown authored
      
      mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
        Fixing test to use different positions depending on binlog format.
      mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result:
        Result change.
      mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
        Result change.
      mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam.test:
        Removing part of test that does not work any more.
      mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test:
        Removing part of test that does not work any more.
      c06d3d70
  10. 10 Jan, 2008 1 commit
    • unknown's avatar
      BUG#27779: Slave cannot read old rows log events. · 3a6e84a2
      unknown authored
      Problem: Replication fails when master is mysql-5.1-wl2325-5.0-drop6 and
      slave is mysql-5.1-new-rpl. The reason is that, in
      mysql-5.1-wl2325-5.0-drop6, the event type id's were different than in
      mysql-5.1-new-rpl.
      Fix (in mysql-5.1-new-rpl):
       (1) detect that the server that generated the events uses the old
      format, by checking the server version of the format_description_log_event
      This patch recognizes mysql-5.1-wl2325-5.0-drop6p13-alpha,
      mysql-5.1-wl2325-5.0-drop6, mysql-5.1-wl2325-5.0, mysql-5.1-wl2325-no-dd.
       (2) if the generating server is old, map old event types to new event
      types using a permutation array.
      
      I've also added a test case which reads binlogs for four different
      versions.
      
      
      mysql-test/suite/binlog/std_data/binlog_old_version_5_1-telco.000001:
        BitKeeper file /home/sven/bk/b27779-old_row_events/5.1-new-rpl/mysql-test/suite/binlog/std_data/binlog_old_version_5_1-telco.000001
      mysql-test/suite/binlog/std_data/binlog_old_version_5_1-wl2325_row.000001:
        BitKeeper file /home/sven/bk/b27779-old_row_events/5.1-new-rpl/mysql-test/suite/binlog/std_data/binlog_old_version_5_1-wl2325_row.000001
      mysql-test/suite/binlog/std_data/binlog_old_version_5_1-wl2325_stm.000001:
        BitKeeper file /home/sven/bk/b27779-old_row_events/5.1-new-rpl/mysql-test/suite/binlog/std_data/binlog_old_version_5_1-wl2325_stm.000001
      mysql-test/suite/binlog/std_data/binlog_old_version_5_1_17.000001:
        BitKeeper file /home/sven/bk/b27779-old_row_events/5.1-new-rpl/mysql-test/suite/binlog/std_data/binlog_old_version_5_1_17.000001
      mysql-test/suite/binlog/std_data/binlog_old_version_5_1_23.000001:
        BitKeeper file /home/sven/bk/b27779-old_row_events/5.1-new-rpl/mysql-test/suite/binlog/std_data/binlog_old_version_5_1_23.000001
      sql/log_event.cc:
        Added code to read events generated by
        mysql-5.1-wl2325-5.0-drop6p13-alpha, mysql-5.1-wl2325-5.0-drop6,
        mysql-5.1-wl2325-5.0, mysql-5.1-wl2325-no-dd.
        More precisely, the event type id's had different numbers in
        those versions. To fix, we add a permutation array which maps old_id to
        new_id when the format_description_log_event indicates that the
        originating server is of the old type. We also need to permute the
        post_header_len array accordingly.
      sql/log_event.h:
        sql/log_event.h@1.169, 2008-01-09 11:34:37+01:00, sven@riska.(none) +5 -1
        Added declaration needed in log_event.cc. Also, the destructor of
        Format_description_log_event is sometimes called when post_header_len is
        null, so we must pass the MY_ALLOW_ZERO_PTR flag to my_free.
      mysql-test/suite/binlog/r/binlog_old_versions.result:
        Result file for new test.
      mysql-test/suite/binlog/t/binlog_old_versions.test:
        New test case that loads binlogs from several old versions.
      3a6e84a2
  11. 06 Jan, 2008 6 commits
  12. 02 Jan, 2008 2 commits
  13. 31 Dec, 2007 1 commit
  14. 25 Dec, 2007 1 commit
    • unknown's avatar
      WL#4077, added mask for SHOW DATABASES statement · d658b408
      unknown authored
      
      mysql-test/suite/rpl/r/rpl_create_database.result:
        updated result file
      mysql-test/suite/rpl/r/rpl_load_from_master.result:
        updated result file
      mysql-test/suite/rpl/t/rpl_create_database.test:
        added the mask 'mysql%' for SHOW DATABASES
      mysql-test/suite/rpl/t/rpl_load_from_master.test:
        added the mask 'mysql%' for SHOw DATABASES
      d658b408
  15. 24 Dec, 2007 4 commits
  16. 23 Dec, 2007 1 commit
    • unknown's avatar
      bug#30435 · 46bfdbca
      unknown authored
      changes due to non-determinism in value of read_buffer_size.
      
      
      mysql-test/r/rpl_loaddata_map.result:
        results changed
      mysql-test/t/rpl_loaddata_map.test:
        showing only the fact that the buffer size is larger than the packet size.
      mysql-test/std_data/bug30435_10k_items.txt:
        data for bug#30435 regression testing
      mysql-test/std_data/bug30435_5k.txt:
        data for bug#30435 regression testing
      46bfdbca
  17. 22 Dec, 2007 1 commit
    • unknown's avatar
      bug#30435 · ff84f404
      unknown authored
      refining the test after it failed on pb.
      
      
      mysql-test/r/rpl_loaddata_map.result:
        results changed
      mysql-test/t/rpl_loaddata_map.test:
        refining the test
      ff84f404
  18. 21 Dec, 2007 1 commit