1. 20 Nov, 2007 1 commit
    • unknown's avatar
      BUG#31581: 5.1-telco-6.1 -> 5.1.22. Slave crashes during starting · ccfcd595
      unknown authored
      This patch has two purposes:
      (1) To refactor the code so that
         {Write|Update|Delete}_rows_log_event_old does not use code from
         {Write|Update|Delete}_rows_log_event. Before refactoring there
         was the following problem: whenever we modifed the code for new
         events, it affected the old events. This is bad, as it makes
         maintainance difficult. After refactoring, we can safely edit the
         new code without affecting old events. So, if we for instance
         modify the binary format of new events, we no longer need to worry
         about how the new code reads old events.
      (2) To fix BUG#31581.
      
      These two objectives are reached by the following changes:
       - Merged Rows_log_event into Old_rows_log_event and
         {Write|Update|Delete}_rows_log_event into
         {Write|Update|Delete}_rows_log_event_old.
       - Fixed the bug by replacing {WRITE|UPDATE|DELETE}_ROWS_EVENT by
         PRE_GA_{WRITE|UPDATE|DELETE}_ROWS_EVENT.
       - Added comments to log_event_old.h
      
      (This patch is identical to the previously committed patch which was
      a collapse of three changesets, except that it adds assert(0) to
      constructors for old types of row log events that should never be
      called.)
      
      
      sql/log_event_old.cc:
        Merged Rows_log_event into Old_rows_log_event and
        {Write|Update|Delete}_rows_log_event into
        {Write|Update|Delete}_rows_log_event_old. Also fixed the bug by
        replacing {WRITE|UPDATE|DELETE}_ROWS_EVENT by
        PRE_GA_{WRITE|UPDATE|DELETE}_ROWS_EVENT.
      sql/log_event_old.h:
        Merged Rows_log_event into Old_rows_log_event and
        {Write|Update|Delete}_rows_log_event into
        {Write|Update|Delete}_rows_log_event_old. Also added comment
        explaining what the file contains and what the classes do.
      ccfcd595
  2. 12 Nov, 2007 1 commit
    • unknown's avatar
      Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl · 296931c1
      unknown authored
      into  koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.1/bug31170-rpl_innodb_bug28430_fails
      
      
      mysql-test/suite/rpl/r/rpl_innodb_bug28430.result:
        Auto merged
      mysql-test/suite/rpl/t/rpl_innodb_bug28430.test:
        manual merge
      296931c1
  3. 09 Nov, 2007 3 commits
    • unknown's avatar
      BUG#31552 (Replication breaks when deleting rows from out-of-sync table without PK): · e7c56ceb
      unknown authored
      Pushing test case for bug only. Bug already fixed as a result of the patch for BUG#19958.
      
      
      mysql-test/extra/rpl_tests/rpl_row_basic.test:
        Adding test to see that no error is given on slave when deleting
        rows that don't exist on table without primary key.
      mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result:
        Result change.
      mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result:
        Result change.
      mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result:
        Result change.
      e7c56ceb
    • unknown's avatar
      Fixing some tests to make the replication team tree green. · 1aa12b22
      unknown authored
      
      mysql-test/suite/rpl/r/rpl_found_rows.result:
        Result change.
      mysql-test/suite/rpl/t/rpl_found_rows.test:
        Adding ORDER BY to avoid order dependencies.
        Setting BINLOG_FORMAT=MIXED; for all master clients: one were missing.
        Dropping procedures that polluted later test results.
      1aa12b22
    • unknown's avatar
      Bug #31170 rpl_innodb_bug28430 fails: varying timing, ports, and log use · dc34f928
      unknown authored
      Non-deterministic parameters  of  SHOW SLAVE STATUS are masked out
      by means of using the standard include-macro.
      
      The masked-out parameters are not needed by the logics of the original
      tests. What is need to demonstre that replication is not stopped remains.
      
      
      
      mysql-test/suite/rpl/r/rpl_innodb_bug28430.result:
        results changed
      mysql-test/suite/rpl/t/rpl_innodb_bug28430.test:
        using the standard macro that takes care of masking out env specific values
      dc34f928
  4. 08 Nov, 2007 2 commits
  5. 07 Nov, 2007 4 commits
  6. 06 Nov, 2007 16 commits
    • unknown's avatar
      Merge koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.0/bug27571_asyn_killed_flags · cb9af6f8
      unknown authored
      into  koti.dsl.inet.fi:/home/elkin/MySQL/merge-5.1
      
      
      mysql-test/suite/binlog/r/binlog_killed.result:
        Auto merged
      mysql-test/suite/binlog/t/binlog_killed.test:
        Auto merged
      mysql-test/suite/rpl/t/rpl_dual_pos_advance.test:
        Auto merged
      mysql-test/suite/rpl/t/rpl_temporary.test:
        manual merge
      sql/log.cc:
        manual merge
      cb9af6f8
    • 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
      bug#27571 · febb4201
      unknown authored
      tests fixing: refreshing the results file.
      
      
      mysql-test/suite/binlog/r/binlog_killed.result:
        results changed
      febb4201
    • unknown's avatar
      BUG#12092 (FOUND_ROWS() not replicated): · 657dca93
      unknown authored
      In BUG#30244 added FOUND_ROWS() as an unsafe function, but that
      works only in mixed mode under 5.1. There is a workaround that
      can be used in statement-based mode either under 5.0 or 5.1
      where the result of FOUND_ROWS() is stored into a user vari-
      able and used that way instead. This will replicate correctly
      even under statement-based replication, since it will write
      a User_var entry to the binary log. For some other cases, the
      value has to be passed explicitly.
      
      This patch adds tests to demonstrate that the workarounds docu-
      mented for statement-based replication works as advertised, and
      does more extensive tests for cases that does not work under sta-
      tement-based replication actually work under mixed mode by switch-
      ing to row-based replication.
      
      
      mysql-test/include/reset_master_and_slave.inc:
        New BitKeeper file ``mysql-test/include/reset_master_and_slave.inc''
      mysql-test/suite/rpl/r/rpl_found_rows.result:
        New BitKeeper file ``mysql-test/suite/rpl/r/rpl_found_rows.result''
      mysql-test/suite/rpl/t/rpl_found_rows.test:
        New BitKeeper file ``mysql-test/suite/rpl/t/rpl_found_rows.test''
      657dca93
    • 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
      results from 5.0 is not needed · 8d4fdc5c
      unknown authored
      
      BitKeeper/deleted/.del-binlog_killed_simulate.result:
        Delete: mysql-test/r/binlog_killed_simulate.result
      8d4fdc5c
    • unknown's avatar
      Merge koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0 · 74174d6f
      unknown authored
      into  koti.dsl.inet.fi:/home/elkin/MySQL/merge-5.1
      
      
      BitKeeper/deleted/.del-binlog_killed_bug27571-master.opt:
        Auto merged
      BitKeeper/deleted/.del-binlog_killed_bug27571.test:
        Auto merged
      74174d6f
    • 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
      Merge koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0 · 80533592
      unknown authored
      into  koti.dsl.inet.fi:/home/elkin/MySQL/merge-5.1
      
      
      mysql-test/suite/binlog/r/binlog_killed.result:
        manual merge ul
      mysql-test/suite/binlog/t/binlog_killed.test:
        manual merge with 5.0 specific tests; use local
      mysql-test/suite/binlog/t/binlog_killed_simulate.test:
         manual merge with 5.0 specific tests; use local
      mysql-test/t/ctype_ucs.test:
        Auto merged
      mysql-test/t/func_regexp.test:
        Auto merged
      mysql-test/r/ctype_ucs.result:
        automerge
      mysql-test/r/ctype_utf8.result:
        automerge
      mysql-test/r/func_regexp.result:
        automerge
      mysql-test/t/ctype_utf8.test:
        automerge
      sql/item_cmpfunc.cc:
        automerge
      sql/item_cmpfunc.h:
        automerge
      sql/sql_class.h:
        automerge
      sql/sql_insert.cc:
        automerge
      sql/sql_parse.cc:
        automerge
      sql/sql_update.cc:
        automerge
      80533592
    • 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
    • unknown's avatar
      bug#27571 · 214b2f71
      unknown authored
      non-deterministic tests refining.
      This particular patch tested on two archs.
      
      
      mysql-test/suite/binlog/t/binlog_killed.test:
        deploying synchronization of killing with reaching the explected state
        of the prey's connection.
      214b2f71
    • unknown's avatar
      bug#27571 · cfc6ae28
      unknown authored
      non-deterministic tests execution on some platforms.
      
      
      mysql-test/suite/binlog/r/binlog_killed.result:
        results changed
      mysql-test/suite/binlog/t/binlog_killed.test:
        correcting the prev test's cleanup;
        increasing time to wait by to be killed query;
        adding the masking out error due to Bug@32140 wrong error code caught when an SF() call is interruped with KILL query
      cfc6ae28
    • unknown's avatar
      Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl · da068436
      unknown authored
      into  kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl
      
      
      da068436
  7. 05 Nov, 2007 3 commits
    • unknown's avatar
      bug#27571 asynchronous setting mysql_`query`::error and Query_log_e::error_code · 5672c2e5
      unknown authored
      refining tests as they appear to be non-deterministic.
      
      
      mysql-test/suite/binlog/r/binlog_killed.result:
        results changed
      mysql-test/suite/binlog/t/binlog_killed.test:
        restructuring the test to deliver more deterministic outcome.
        order-by for update and delete did not guaratee the order of scanning.
        --error are masked with zero in order to catch more info if killing
        really will happen to be non-deterministic on some platform (witnessed
        something like that on dl145j)
      mysql-test/suite/binlog/t/binlog_killed_simulate.test:
        important guard added
      5672c2e5
    • 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
  8. 02 Nov, 2007 5 commits
    • unknown's avatar
      Merge skozlov@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl · f030a4d9
      unknown authored
      into  mysql.com:/home/ksm/commits/mysql-5.1-new-rpl
      
      
      f030a4d9
    • unknown's avatar
      WL#3949. Added an option for support "combinations" of mysqld arguments for a suite · 88e560b0
      unknown authored
      
      mysql-test/lib/mtr_cases.pl:
        updated mtr_cases.pl
      mysql-test/mysql-test-run.pl:
        updated mtr
      88e560b0
    • unknown's avatar
      Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl · e42966f5
      unknown authored
      into  koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.1/bug31554-rpl_truncate
      
      
      e42966f5
    • unknown's avatar
      Bug #31554 rpl.rpl_truncate_2myisam test failure: wrong master binlog file name · 0ac501c7
      unknown authored
      Actually, the failure happened with 3innodb as well. Most probably
      the reason is in failing to delete a binlog file on __NT__ so that
      that master increments the index of the binlog file.
      The test results hide valueable warning that windows could generate
      about that.
      
      The scope of this fix is to make sure we have such warning and
      to lessen chances for binlog file being held at time of closing.
      The dump thread is getting a good chance to leave and 
      release the file for its successful deletion.
      
      We shall watch over the two tests as regression is not excluded.
      In that case we would have an extra info possibly explaining why
      __NT__ env can not close/delete the file.
      However, regardless of that reason, there is alwasy workaround to mask out
      non-deterministic binlog index number.
      
      
      
      mysql-test/extra/rpl_tests/rpl_truncate_helper.test:
        enable warnings for other than DROP queries;
        wait for slave's full stop which ensures io thread left and that
        will be regarded by dump thread to leave and close the binlog file;
        relocating reset master to the end of the test so that the caller of
        this helper should start with the binlog name which has not yet been
        affected/reset since its creation.
      mysql-test/suite/rpl/r/rpl_truncate_2myisam.result:
        results changed
      mysql-test/suite/rpl/r/rpl_truncate_3innodb.result:
        results changed
      0ac501c7
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-rpl · dedbb5b1
      unknown authored
      into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl
      
      
      dedbb5b1
  9. 31 Oct, 2007 5 commits
    • unknown's avatar
      BUG#28086 (SBR of USER() becomes corrupted on slave): · cc0e5465
      unknown authored
      Marking statements containing USER() or CURRENT_USER() as unsafe, causing
      them to switch to using row-based logging in MIXED mode and generate a
      warning in STATEMENT mode.
      
      
      mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result:
        Result change.
      mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test:
        Adding test to check that USER() and CURRENT_USER() cause a switch
        to row-based logging.
      sql/sql_yacc.yy:
        Setting statements containing USER() or CURRENT_USER() to be unsafe.
      cc0e5465
    • unknown's avatar
      rpl_extraSlave_Col.test: · 496bac71
      unknown authored
        Corrected issues found in preparing to push code
      
      
      mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test:
        Corrected issues found in preparing to push code
      496bac71
    • unknown's avatar
      Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl · 3503c923
      unknown authored
      into  mysql.com:/usr/clones/rpl-push
      
      
      3503c923
    • unknown's avatar
      Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl · 5371e4ab
      unknown authored
      into  kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl
      
      
      5371e4ab
    • unknown's avatar
      bug#27571 merging. Fixing offsets and moving tests to the corrent · ffdf36f2
      unknown authored
      destination. Removing wrong (local temp) tests.
      
      
      mysql-test/suite/binlog/t/binlog_killed_simulate-master.opt:
        Rename: mysql-test/t/binlog_killed_simulate-master.opt -> mysql-test/suite/binlog/t/binlog_killed_simulate-master.opt
      BitKeeper/deleted/.del-binlog_killed_bug27571.test:
        Delete: mysql-test/t/binlog_killed_bug27571.test
      BitKeeper/deleted/.del-binlog_killed_bug27571-master.opt:
        Delete: mysql-test/t/binlog_killed_bug27571-master.opt
      mysql-test/suite/binlog/r/binlog_killed.result:
        results changed
      mysql-test/suite/binlog/t/binlog_killed.test:
        binlog offset made 5.1 specific
      mysql-test/suite/binlog/t/binlog_killed_simulate.test:
        binlog offset + guard to run the test with stmt/mixed format
      mysql-test/suite/binlog/r/binlog_killed_simulate.result:
        new results file
      ffdf36f2