1. 22 Jun, 2007 3 commits
  2. 21 Jun, 2007 4 commits
  3. 20 Jun, 2007 5 commits
    • unknown's avatar
      fixed a (merge?) problem running the tests: · 5a9557cf
      unknown authored
      now the cluster related commands have 'use db'
      in the binlog.
      
      5a9557cf
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1 · e98abefa
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/work/failed_rpl_test-5.1-opt
      
      e98abefa
    • unknown's avatar
      Merge mysql.com:/home/hf/work/28839/my50-28839 · 5644c26a
      unknown authored
      into  mysql.com:/home/hf/work/28839/my51-28839
      
      
      mysql-test/r/rpl_skip_error.result:
        Auto merged
      mysql-test/t/rpl_skip_error.test:
        Auto merged
      sql/log_event.cc:
        merging
      5644c26a
    • unknown's avatar
      Bug #28839 Errors in strict mode silently stop SQL thread if --slave-skip-errors exists. · e3eb0750
      unknown authored
      slave_sql thread calls thd->clear_error() to force error to be ignored,
      though this method didn't clear thd->killed state, what causes
      slave_sql thread to stop.
      
      clear thd->killed state if we ignore an error
      
      
      mysql-test/r/rpl_skip_error.result:
        Bug #28839 Errors in strict mode silently stop SQL thread if --slave-skip-errors exists.
        
        test result
      mysql-test/t/rpl_skip_error.test:
        Bug #28839 Errors in strict mode silently stop SQL thread if --slave-skip-errors exists.
        
        test case
      sql/log_event.cc:
        Bug #28839 Errors in strict mode silently stop SQL thread if --slave-skip-errors exists.
        
        clear thd->killed state if we ignore the error
      e3eb0750
    • unknown's avatar
      removed undeterministic tests introduced by the fix for bug 26418 · d8fd02d6
      unknown authored
      
      mysql-test/r/rpl_innodb.result:
        removed undeterministic tests
      mysql-test/t/rpl_innodb.test:
        removed undeterministic tests
      d8fd02d6
  4. 19 Jun, 2007 10 commits
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-opt · 81bdc79c
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B26418-5.1-opt
      
      
      sql/sql_acl.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      81bdc79c
    • unknown's avatar
      Bug #26418: Slave out of sync after · 2e912d99
      unknown authored
       CREATE/DROP TEMPORARY TABLE + ROLLBACK on master
      
      The transaction ability of the storage engines of
      the tables on the replication master and the replication
      slave must generally be the same.
      When the storage engine type of the slave is 
      non-transactional then transactions on the master that 
      mix update of transactional and non-transactional tables
      should be avoided because they will cause inconsistency of
      the data between the master's transactional table and the
      slave's non-transactional table.
      
      The effect described by this bug is actually expected.
      A detailed test case is added (to be merged later to
      the updated rpl_ddl.test), as there was no coverage 
      by the existing tests. 
      Some code cleanup is also added by this change.
      
      
      mysql-test/r/rpl_innodb.result:
        Bug #26418: test case
      mysql-test/t/rpl_innodb.test:
        Bug #26418: test case
      sql/events.cc:
        Bug #26418: replace repeating code with a function call
      sql/sp.cc:
        Bug #26418: replace repeating code with a function call
      sql/sql_acl.cc:
        Bug #26418: replace repeating code with a function call
      sql/sql_class.cc:
        Bug #26418: remove dead code
      sql/sql_class.h:
        Bug #26418: remove dead code
      sql/sql_delete.cc:
        Bug #26418: replace repeating code with a function call
      sql/sql_parse.cc:
        Bug #26418: replace repeating code with a function call
      sql/sql_rename.cc:
        Bug #26418: replace repeating code with a function call
      sql/sql_tablespace.cc:
        Bug #26418: replace repeating code with a function call
      sql/sql_trigger.cc:
        Bug #26418: replace repeating code with a function call
      sql/sql_udf.cc:
        Bug #26418: replace repeating code with a function call
      sql/sql_view.cc:
        Bug #26418: replace repeating code with a function call
      2e912d99
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0 · b828f60d
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
      
      
      configure.in:
        Auto merged
      b828f60d
    • unknown's avatar
      Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1 · 955beb66
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
      
      
      configure.in:
        Auto merged
      955beb66
    • unknown's avatar
      Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0 · 1f82912e
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
      
      
      configure.in:
        Auto merged
      1f82912e
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0 · 2acc6c35
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
      
      2acc6c35
    • unknown's avatar
      try again. · 2c14c986
      unknown authored
      
      configure.in:
        Raise version number after cloning 5.0.44
      2c14c986
    • unknown's avatar
      Merge mysql.com:/home/hf/work/29117/my50-29117 · f4a6f90a
      unknown authored
      into  mysql.com:/home/hf/work/29117/my51-29117
      
      
      sql/net_serv.cc:
        Auto merged
      f4a6f90a
    • unknown's avatar
      Merge mysql.com:/home/hf/work/29117/my41-29117 · 716d8653
      unknown authored
      into  mysql.com:/home/hf/work/29117/my50-29117
      
      
      sql/net_serv.cc:
        Auto merged
      716d8653
    • unknown's avatar
      Bug #29117 (init_file test crashes with embedded server) · edebe52d
      unknown authored
      we use net->vio in my_net_local_init, but in the my_net_init
      implementation we set it after the call, so work with unspecified
      net->vio value
      
      
      sql/net_serv.cc:
        Bug #29117 (init_file test crashes with embedded server)
        
        as we started using net->vio in my_net_local_init, we should set
        it before the call
      edebe52d
  5. 18 Jun, 2007 10 commits
  6. 17 Jun, 2007 8 commits