1. 05 Feb, 2010 20 commits
  2. 04 Feb, 2010 9 commits
  3. 03 Feb, 2010 11 commits
    • Alexander Nozdrin's avatar
      Manual merger from mysql-trunk-merge. · fa03afee
      Alexander Nozdrin authored
      Conflicts:
        - configure.in
      fa03afee
    • Alexander Nozdrin's avatar
      Manual merge from mysql-trunk-merge. · ab737132
      Alexander Nozdrin authored
      Conflicts:
        - configure.in
      ab737132
    • Alexander Nozdrin's avatar
      Manual merge from mysql-trunk-merge. · c7467168
      Alexander Nozdrin authored
      Conflicts:
        - sql/sql_show.cc
      c7467168
    • Alexander Nozdrin's avatar
      Manual merge from mysql-trunk-merge. · 4a6457c8
      Alexander Nozdrin authored
      Conflicts:
        - sql/sql_select.cc
      4a6457c8
    • Alexander Nozdrin's avatar
      Manual merge from mysql-5.1-bugteam. · 1a46ff87
      Alexander Nozdrin authored
      Conflicts:
        - configure.in
        - mysql-test/include/setup_fake_relay_log.inc
        - sql/sql_select.cc
      1a46ff87
    • Luis Soares's avatar
      BUG#50364: manual merge to mysql-next-mr-bugfixing. · 90a79ca4
      Luis Soares authored
                 
      Conflicts
      =========
      Text conflict in sql/repl_failsafe.cc
      
      Additional changes
      ==================
      Replace references to pthread_mutex with mysql_mutex
      90a79ca4
    • Luis Soares's avatar
      BUG#50364: FLUSH LOGS crashes the server (rpl.rpl_heartbeat_basic · 55aab082
      Luis Soares authored
      fails in PB sporadically)
            
      The IO thread can concurrently access the relay log IO_CACHE
      while another thread is performing an FLUSH LOGS procedure.
            
      FLUSH LOGS closes and reopens the relay log and while doing so it
      (re)initializes its IO_CACHE. During this procedure the IO_CACHE
      mutex is also reinitialized, which can cause problems if some
      other thread (namely the IO THREAD) is concurrently accessing it
      at the time .
            
      This patch fixes the problem by extending the interface of the
      flush_master_info function to also include a second paramater, 
      "need_relay_log_lock", stating whether the thread should grab the 
      relay log lock or not before actually flushing the relay log. 
      Also, IO thread now calls flush_master_info with this flag set 
      when it flushes master info with in the event read_event loop.
      
      Finally, we also increase loop time in rpl_heartbeat_basic test 
      case, so that the number of calls to flush logs doubles, stressing
      this part of the code a little more.
      
      mysql-test/suite/rpl/t/rpl_heartbeat_basic.test:
        Doubled the number of iterations on the FLUSH LOGS loop by
        doubling the time available to perform all iterations.
      sql/repl_failsafe.cc:
        Updating flush_master_info call so that it uses two parameters
        instead of one.
      sql/rpl_mi.cc:
        Updating flush_master_info call so that it uses two parameters
        instead of one.
      sql/rpl_mi.h:
        Changed flush_master_info interface. Now takes a second parameter
        instead of just one. The second parameter is: need_lock_relay_log.
      sql/rpl_rli.cc:
        Small fix in comment.
      sql/slave.cc:
        Updating flush_master_info call so that it uses two parameters
        instead of one.
      sql/sql_repl.cc:
        Updating flush_master_info call so that it uses two parameters
        instead of one.
      55aab082
    • Alexander Nozdrin's avatar
    • Alexander Nozdrin's avatar
      Manual merge from mysql-5.1-bugteam. · defe010c
      Alexander Nozdrin authored
      Conflicts:
        - sql/mysqld.cc
      defe010c
    • Alexander Nozdrin's avatar
      Manual merge from mysql-trunk-merge. · 1ab31553
      Alexander Nozdrin authored
      Conflicts:
        - mysql-test/t/bug46080.test
      1ab31553
    • Georgi Kodinov's avatar
      merge · b51fa70a
      Georgi Kodinov authored
      b51fa70a