1. 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
  2. 21 Dec, 2007 5 commits
    • unknown's avatar
      Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl · ce187c0d
      unknown authored
      into  koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.0/bug33435-load_data_read_buffer_size
      
      
      sql/sql_repl.cc:
        Auto merged
      ce187c0d
    • unknown's avatar
      BUG#30435 loading large LOAD DATA INFILE breaks slave with · 40d89c44
      unknown authored
                read_buffer_size set on master
      BUG#33413 show binlog events fails if binlog has event size of close
                to max_allowed_packet
      
      
      The size of Append_block replication event was determined solely by
      read_buffer_size whereas the rest of replication code deals with
      max_allowed_packet.
      When the former parameter was set to larger than the latter there were
      two artifacts: the master could not read events from binlog;
      show master events did not show.
      
      Fixed with 
      - fragmenting the used io-cached buffer into pieces each size of less
        than max_allowed_packet (bug#30435)
      - incrementing show-binlog-events handling thread's max_allowed_packet
        with the max estimated for the replication header size
      
      
      include/my_sys.h:
        accessor-macros added in order not to mess with the io cache's implementation
        details in code that merely exploits the io-cache.
      sql/sql_repl.cc:
        BUG#33413: incrementing thd->variables.max_allowed_packet with 
        the max estimation for the replication header size (from bug#19402);
        refactoring log_loaded_block() to fragment the io_cache buffer in case
         read_buffer_size > max_allowed_packet.
      mysql-test/r/rpl_loaddata_map.result:
        New BitKeeper file ``mysql-test/r/rpl_loaddata_map.result''
      mysql-test/t/rpl_loaddata_map-master.opt:
        specific options to trigger  BUG#30435,  BUG#33413 situations
      mysql-test/t/rpl_loaddata_map-slave.opt:
        max_allowed_packet to be compatible with the master's version.
      mysql-test/t/rpl_loaddata_map.test:
        regression tests for two bugs.
      40d89c44
    • unknown's avatar
      Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl · 0718fb66
      unknown authored
      into  koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.0/bug31359-future_gpos
      
      
      0718fb66
    • unknown's avatar
      Bug #31359 change_master sets group_master_log_pos twice, · 544781ad
      unknown authored
                  ignores future_group_master_log_p
      
      There was a redundant assignement. However, that's the only artifact.
      Wrt to future_group_master_log_position, there is no issue.
      The counter is supposed to be set at Log_event::exec_event().
      It's used only by Innodb for recovery purposes.
      
      
      sql/sql_repl.cc:
        removing a redundant line which arrived with the revision 1.102.1.7.
      544781ad
    • unknown's avatar
      Merge capulet.kindahl.net:/home/mats/devel/b12691-mysql-5.0-rpl · 9d7c0dda
      unknown authored
      into  capulet.kindahl.net:/home/mats/devel/fix-mysql-5.0-rpl
      
      
      9d7c0dda
  3. 20 Dec, 2007 1 commit
    • unknown's avatar
      BUG#12691 (Exec_master_log_pos corrupted with SQL_SLAVE_SKIP_COUNTER): · 150590a0
      unknown authored
      Complementary patch since LOAD DATA INFILE was not covered in
      the previous patch.
      
      This patch adds a check so that the slave skip counter is not
      decreased to zero if seeing a BEGIN_LOAD_QUERY_EVENT,
      APPEND_BLOCK_EVENT, or CREATE_FILE_EVENT since these cannot
      end a group. The group is terminated by an EXECUTE_LOAD_QUERY_
      EVENT or DELETE_FILE_EVENT.
      
      
      mysql-test/r/rpl_slave_skip.result:
        Result change.
      mysql-test/t/rpl_slave_skip.test:
        Adding tests to test that the first event of a LOAD DATA INFILE
        can be skipped safely for both transactional and non-transactional
        tables. Also include a case that will generate a DELETE_FILE event
        last in the group, and this should be properly skipped as well.
      sql/slave.cc:
        Not decrementing slave skip counter to zero when seeing a
        BEGIN_LOAD_QUERY_EVENT, APPEND_BLOCK_EVENT, or CREATE_FILE_EVENT
        since these cannot end a group.
      150590a0
  4. 15 Dec, 2007 1 commit
    • unknown's avatar
      BUG#32205 Replaying statements from mysqlbinlog fails with a syntax error, replicates fine · 59035063
      unknown authored
      The reason of this bug is that when mysqlbinlog dumps a query, the query is written to
      output with a delimeter appended right after it, if the query string ends with a '--'
      comment, then the delimeter would be considered as part of the comment, if there are any
      statements after this query, then it will cause a syntax error.
      
      Start a newline before appending delimiter after a query string
      
      
      mysql-test/r/ctype_ucs_binlog.result:
        Update test result for BUG#32205
      mysql-test/r/mix_innodb_myisam_binlog.result:
        Update test result for BUG#32205
      mysql-test/r/mysqlbinlog.result:
        Update test result for BUG#32205
      mysql-test/r/rpl_charset.result:
        Update test result for BUG#32205
      mysql-test/r/rpl_timezone.result:
        Update test result for BUG#32205
      mysql-test/r/user_var-binlog.result:
        Update test result for BUG#32205
      mysql-test/t/mix_innodb_myisam_binlog.test:
        Fixed for BUG#32205
      sql/log_event.cc:
        Start a newline before appending delimiter after a query string
      mysql-test/r/binlog_start_comment.result:
        Add test for BUG#32205
      mysql-test/t/binlog_start_comment.test:
        Add test for BUG#32205
      59035063
  5. 11 Dec, 2007 1 commit
  6. 05 Dec, 2007 1 commit
    • unknown's avatar
      sql_string.cc: · c4faf61a
      unknown authored
        Fixing a wrong comment.
      
      
      sql/sql_string.cc:
        Fixing a wrong comment.
      c4faf61a
  7. 03 Dec, 2007 1 commit
    • unknown's avatar
      Bug#30998 Drop View breaks replication if view does not exist · df35f2c3
      unknown authored
        
      When executing drop view statement on the master, the statement is written
      into bin-log without checking for possible errors, so the statement would 
      always be bin-logged with error code cleared even if some error might occur, 
      for example, some of the views being dropped does not exist. This would cause 
      failure on the slave.
      
      Writing bin-log after check for errors, if at least one view has been dropped
      the query is bin-logged possible with an error.
      
      
      sql/sql_view.cc:
        Writing bin-log after check for errors, if at least one view has been dropped
        the query is bin-logged possible with an error.
      mysql-test/r/rpl_drop_view.result:
        Add test result for bug#30998
      mysql-test/t/rpl_drop_view.test:
        Add test for bug#30998
      df35f2c3
  8. 22 Nov, 2007 1 commit
  9. 14 Nov, 2007 3 commits
  10. 13 Nov, 2007 2 commits
  11. 12 Nov, 2007 1 commit
  12. 10 Nov, 2007 1 commit
    • unknown's avatar
      Adding build scripts for Solaris 10 on AMD64. · 7f84f426
      unknown authored
      
      BUILD/compile-solaris-amd64:
        Changing build script to be in line with the other build scripts
        using GCC.
      BUILD/compile-solaris-amd64-debug:
        Adding build script for Solaris 10 on AMD64.
      BUILD/compile-solaris-amd64-forte-debug:
        Adding build script for Solaris 10 on AMD64.
      BUILD/compile-solaris-amd64-forte:
        Adding build script for Solaris 10 on AMD64.
      7f84f426
  13. 09 Nov, 2007 3 commits
    • unknown's avatar
      Merge capulet.net:/home/bk/mysql-5.0-rpl · 9eb28b96
      unknown authored
      into  capulet.net:/home/mats/devel/b31793-mysql-5.0-rpl
      
      
      sql/log_event.cc:
        Auto merged
      9eb28b96
    • unknown's avatar
      Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl · d7bc28fc
      unknown authored
      into  capulet.net:/home/bk/mysql-5.0-rpl
      
      
      d7bc28fc
    • unknown's avatar
      BUG#31793 (log event corruption causes crash): · dc91bc74
      unknown authored
      When running mysqlbinlog on a 64-bit machine with a corrupt relay log,
      it causes mysqlbinlog to crash. In this case, the crash is caused
      because a request for 18446744073709534806U bytes is issued, which
      apparantly can be served on a 64-bit machine (speculatively, I assume)
      but this causes the memcpy() issued later to copy the data to segfault.
      
      The request for the number of bytes is caused by a computation
      of data_len - server_vars_len where server_vars_len is corrupt in such
      a sense that it is > data_len. This causes a wrap-around, with the
      the data_len given above.
      
      This patch adds a check that if server_vars_len is greater than
      data_len before the substraction, and aborts reading the event in
      that case marking the event as invalid. It also adds checks to see
      that reading the server variables does not go outside the bounds
      of the available space, giving a limited amount of integrity check.
      
      
      mysql-test/r/mysqlbinlog.result:
        Result change.
      mysql-test/t/mysqlbinlog.test:
        Adding test that it fails gracefully for a corrupt relay log.
      sql/log_event.cc:
        Adding check that status var length does not cause wrap-around
        when performing subtraction. Extending get_str_len_and_pointer() to
        check that the string can actually be read without reading outside
        bounds. Adding checks when reading server variables from the Query-
        log_event so that the variable can really be read. Abort reading
        and mark the event as invalid otherwise.
      mysql-test/std_data/corrupt-relay-bin.000624:
        BitKeeper file /home/mats/devel/b31793-mysql-5.0-rpl/mysql-test/std_data/corrupt-relay-bin.000624
      dc91bc74
  14. 06 Nov, 2007 7 commits
    • unknown's avatar
      Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl · 6957e84e
      unknown authored
      into  koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.0/bug27571_asyn_killed_flags
      
      
      6957e84e
    • unknown's avatar
      bug#27571 · 0c1a085c
      unknown authored
      refining non-deterministic tests.
      The new Bug@32148 is in the way. Adjuting the tests to be somehow useful.
       
      
      
      mysql-test/r/binlog_killed.result:
        results changed
      mysql-test/t/binlog_killed.test:
        refining the tests as killing is inherently non-deterministic;
        leaving todos.
      0c1a085c
    • unknown's avatar
      Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl · 0216fb0d
      unknown authored
      into  koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.0/bug28597-log_name_upgrade
      
      
      0216fb0d
    • unknown's avatar
      bug#27571 · d8c4501b
      unknown authored
      fixing tests
      
      
      mysql-test/r/binlog_killed_simulate.result:
        the new tests' result
      d8c4501b
    • unknown's avatar
      bug#27571 · 86e07400
      unknown authored
      removing extra tests (on 5.1 that's been already done)
      
      
      BitKeeper/deleted/.del-binlog_killed_bug27571-master.opt:
        Delete: mysql-test/t/binlog_killed_bug27571-master.opt
      BitKeeper/deleted/.del-binlog_killed_bug27571.test:
        Delete: mysql-test/t/binlog_killed_bug27571.test
      86e07400
    • unknown's avatar
      bug#27571 · 3cc49bbe
      unknown authored
      commit is specific for 5.0 to eliminated non-deterministic tests.
      Those tests run only in 5.1 env where there is a necessary devices such
      as processlist table of info_schema.
      
      
      mysql-test/r/binlog_killed.result:
        results changed
      mysql-test/t/binlog_killed.test:
        removing non-deterministic part of the test
      mysql-test/t/binlog_killed_simulate.test:
        adding the guard same as for 5.1 version
      3cc49bbe
    • unknown's avatar
      Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl · b4db3f3f
      unknown authored
      into  koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.0/bug27571_asyn_killed_flags
      
      
      sql/sql_insert.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      b4db3f3f
  15. 05 Nov, 2007 3 commits
    • unknown's avatar
      Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-base · 441b8608
      unknown authored
      into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-rt-merge
      
      
      441b8608
    • unknown's avatar
      Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl · c0be4995
      unknown authored
      into  koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.0/bug28597-log_name_upgrade
      
      
      c0be4995
    • unknown's avatar
      Bug #28597 Replication doesn't start after upgrading to 5.1.18 · b7cdb978
      unknown authored
      Since bug@20166, which replaced the binlog file name generating to base
      on pidfile_name instead of the previous glob_hostname, the binlog file
      name suddenly started to be stored solely in the absolute path format,
      including a case when --log-bin option meant a relative path.
      What's more serious, the path for binlog file can lead unrequestedly 
      to pid-file directory so that after any proper fix for this bug
      there might be similar to the bug report consequences for one who
      upgrades from post-fix-bug@20166-pre-fix-bug@28597 to post-fix-bug@28597.
      
      Fixed with preserving`pidfile_name' (intr.by bug@20166) but stripping
      off its directory part. This restores the original logics of storing
      the names in compatible with --log-bin option format and with the
      requirement for --log-bin ralative path to corresond to the data directory.
      Side effects for this fix:
      
      effective fixing bug@27070, refining its test;
      ensuring no overrun for buff can happen anymore (Bug#31836 
      insufficient space reserved for the suffix of relay log file name);
      bug#31837  --remove_file $MYSQLTEST_VARDIR/tmp/bug14157.sql missed
      in rpl_temporary.test;
      fixes Bug@28603  Invalid log-bin default location;
      
      
      mysql-test/t/rpl_dual_pos_advance.test:
        After correcting the logics of log file name composing workaround for
        
          Bug #27070 server logs are created unrequested and in wrong directory
        
        is removed.
      mysql-test/t/rpl_temporary.test:
        remaining temp file of the test removed
      sql/log.cc:
        stripping off the directory part of `pidfile_name' for binlog name
        generating (which fixes two more bugs on wrong binlog file location);
        ensuring no overrun for buff can happen anymore (Bug #31836 
        insufficient space reserved for the suffix of relay log file name);
      b7cdb978
  16. 02 Nov, 2007 2 commits
  17. 01 Nov, 2007 2 commits
  18. 31 Oct, 2007 3 commits
  19. 30 Oct, 2007 1 commit
    • unknown's avatar
      Makefile.am: · 1de7e5c0
      unknown authored
        Ensure use of libedit "config.h" by adding "-I. -I$(srcdir)" to DEFS,
        work around for problem with automake 1.10 (bug#24809)
      
      
      cmd-line-utils/libedit/Makefile.am:
        Ensure use of libedit "config.h" by adding "-I. -I$(srcdir)" to DEFS,
        work around for problem with automake 1.10 (bug#24809)
      1de7e5c0