1. 25 Mar, 2005 1 commit
  2. 24 Mar, 2005 7 commits
  3. 23 Mar, 2005 4 commits
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com://home/bk/mysql-4.1 · e289fa2e
      unknown authored
      into quadita2.mysql.com:/nfstmp1/guilhem/mysql-4.1-4ita
      
      e289fa2e
    • unknown's avatar
      "After Monty's review" changes to the fix for BUG#8325 "Deadlock in... · 832800cc
      unknown authored
      "After Monty's review" changes to the fix for BUG#8325 "Deadlock in replication thread stops replication":
      s/sleep/safe_sleep (thread safe); sleep 0/1/2/3/4/5/5/5 (get slave less late);
      no message on error log (deadlock is too common sometimes), a global counter
      instead (SHOW STATUS LIKE 'slave_retried_transactions').
      Plus a fix for libmysql/Makefile.shared
      
      
      libmysql/Makefile.shared:
        When we "make clean" in libmysql/ we remove the symlinks there, so we
        need to mark that they have to be recreated later: this is done by removing
        ../linked_libmysql_sources. If we don't do this, 'make' will fail after 'cd libmysql;make clean'.
        This Makefile.shared is used by libmysql_r too.
        No reason to remove linked_client_sources as we don't remove the links in client/.
      mysql-test/r/rpl_deadlock.result:
        result fix
      mysql-test/t/rpl_deadlock.test:
        small test addition
      sql/mysqld.cc:
        if active_mi could not be alloced, die. New SHOW STATUS LIKE "slave_retried_transactions".
      sql/slave.cc:
        If slave retries automatically a transaction, no message on error log
        (too common situation); sleep 0 secs at first retry, then 1, 2, 3, 4,
        5, 5, 5... Sleeping 0 is to get the least possible late, as deadlocks
        are usually resolved at first try. New global counter rli->retried_trans
        (for SHOW STATUS: total number of times the slave had to retry
        any transaction). safe_sleep() is thread-safe, sleep() was not.
        I change the rli->trans_retries counter to go from 0 to max instead
        of the other way (better for new sleep()).
      sql/slave.h:
        new global counter rli->retried_trans
      sql/sql_show.cc:
        SHOW STATUS LIKE "slave_retried_transactions"; needs replication mutexes.
        Can't be a simple SHOW_LONG, because active_mi is unset (not alloced yet)
        when the static global status_vars is created (active_mi is set
        in init_slave()).
      sql/structs.h:
        new SHOW_SLAVE_RETRIED_TRANS
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      832800cc
    • unknown's avatar
      README: · 355cd2eb
      unknown authored
        Fix typo.
      
      
      mysql-test/README:
        Fix typo.
      355cd2eb
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 77426844
      unknown authored
      into neptunus.(none):/home/msvensson/mysql/mysql-4.1
      
      77426844
  4. 22 Mar, 2005 8 commits
  5. 21 Mar, 2005 7 commits
    • unknown's avatar
      trx0trx.c: · 51e76a5e
      unknown authored
        If MySQL wrote to its binlog, but for some reason trx->update_undo and trx->insert_undo were NULL in InnoDB, then trx->commit_lsn was garbage, and InnoDB could assert in the log flush of trx_commit_complete_for_mysql() (Bug #9277)
      
      
      innobase/trx/trx0trx.c:
        If MySQL wrote to its binlog, but for some reason trx->update_undo and trx->insert_undo were NULL in InnoDB, then trx->commit_lsn was garbage, and InnoDB could assert in the log flush of trx_commit_complete_for_mysql() (Bug #9277)
      51e76a5e
    • unknown's avatar
      Merge · 4adbc670
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      innobase/include/trx0trx.h:
        Auto merged
      innobase/trx/trx0trx.c:
        SCCS merged
      4adbc670
    • unknown's avatar
      trx0trx.c, trx0trx.h: · a422f163
      unknown authored
        If MySQL wrote to its binlog, but for some reason trx->update_undo and trx->insert_undo were NULL in InnoDB, then trx->commit_lsn was garbage, and InnoDB could assert in the log flush of trx_commit_complete_for_mysql() (Bug #9277)
      
      
      innobase/include/trx0trx.h:
        If MySQL wrote to its binlog, but for some reason trx->update_undo and trx->insert_undo were NULL in InnoDB, then trx->commit_lsn was garbage, and InnoDB could assert in the log flush of trx_commit_complete_for_mysql() (Bug #9277)
      innobase/trx/trx0trx.c:
        If MySQL wrote to its binlog, but for some reason trx->update_undo and trx->insert_undo were NULL in InnoDB, then trx->commit_lsn was garbage, and InnoDB could assert in the log flush of trx_commit_complete_for_mysql() (Bug #9277)
      a422f163
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-build · ab901d18
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
      
      ab901d18
    • unknown's avatar
      A fix for Netware. · f6ad3d72
      unknown authored
      f6ad3d72
    • unknown's avatar
      mtr_report.pl: · 77633821
      unknown authored
        Made --timer work
      mtr_cases.pl:
        Added option --reorder to get less server restarts
      mysql-test-run.pl:
        Added option --reorder to get less server restarts
        Moved do_before_start_master() not to remove binlog files unless restarted
        Made --timer work
        Slave was incorrectly writing log to error log
      
      
      mysql-test/mysql-test-run.pl:
        Added option --reorder to get less server restarts
        Moved do_before_start_master() not to remove binlog files unless restarted
        Made --timer work
        Slave was incorrectly writing log to error log
      mysql-test/lib/mtr_cases.pl:
        Added option --reorder to get less server restarts
      mysql-test/lib/mtr_report.pl:
        Made --timer work
      77633821
    • unknown's avatar
      BUG#9072 'Max_error_count' system variable cannot be set to zero · 57ca6dd8
      unknown authored
       - Chaned min value in mysqld.cc
       - Added testcase to warnings.test
      
      
      mysql-test/r/warnings.result:
        Added testcase for testing max and min value of max_error_count
      mysql-test/t/warnings.test:
        Added testcase for testing max and min value of max_error_count
      sql/mysqld.cc:
        Change min value of max_error_count from 1 to 0
      57ca6dd8
  6. 18 Mar, 2005 3 commits
  7. 17 Mar, 2005 10 commits