1. 19 May, 2011 3 commits
    • Luis Soares's avatar
      BUG#11746302 · b14c541a
      Luis Soares authored
      Manual merged mysql-5.1-gca into latest mysql-5.5.
      
      Conflicts
      =========
      Text conflict in mysql-test/suite/rpl/r/rpl_relayspace.result
      Text conflict in mysql-test/suite/rpl/t/rpl_relayspace.test
      b14c541a
    • Luis Soares's avatar
      BUG#11746302: 25228: RPL_RELAYSPACE.TEST FAILS ON POWERMACG5, · 21163d68
      Luis Soares authored
                    VM-WIN2003-32-A, SLES10-IA64-A 
            
      The test case waits for master_pos_wait not to timeout, which
      means that the deadlock between SQL and IO threads was 
      succesfully and automatically dealt with.
            
      However, very rarely, master_pos_wait reports a timeout. This
      happens because the time set for master_pos_wait to wait was
      too small (6 seconds). On slow test env this could be a 
      problem.
            
      We fix this by setting the timeout inline with the one used
      in sync_slave_with_master (300 seconds). In addition we 
      refactored the test case and refined some comments.
      21163d68
    • Mikael Ronström's avatar
      merge · 84af7972
      Mikael Ronström authored
      84af7972
  2. 18 May, 2011 5 commits
  3. 16 May, 2011 6 commits
  4. 14 May, 2011 2 commits
  5. 13 May, 2011 7 commits
    • Marc Alff's avatar
      Bug#12552516 LF_HASH REQUIRES MY_THREAD_INIT() · 4075c52b
      Marc Alff authored
      Before this fix, a thread instrumented for the performance schema,
      that would perform file io operations, could crash inside the LF_HASH
      implementation, in cases when my_thread_init is not called.
      
      The crash itself has not been reported in 5.5 but similar crashes have
      been found in 5.6-based development branches, using LF_HASH for
      more instrumentation.
      
      The possibility of a crash in 5.5 is confirmed by code analysis.
      
      The problem is that, when my_thread_init() is not called,
      which can happen for threads in storage engines or thirs party code,
      my_thread_var is NULL.
      
      Using my_thread_var->stacks_ends_here in mysys/lf_alloc-pin.c is unsafe.
      
      Given that my_thread_var is used:
      - only for stacks_ends_here
      - only on platform with HAVE_ALLOCA
      - only when there is enough room on the stack
      and given that the LF_HASH implementation has a fallback
      algorythm implemented already when using alloca is not possible,
      using my_thread_var->stacks_ends_here is in fact not a strict requirement,
      and can be relaxed.
      
      The fix is to:
      - test explicitly if my_thread_var is NULL, to account for cases
        when my_thread_init() is not used by the calling thread.
      - not use alloca in this case, and rely on the fall back code already in place.
        so that the LF_HASH can be supported even without my_thread_init().
      
      The implementation of mysys/lf_alloc-pin.c has been fixed to support this new usage.
      The units tests in unittest/mysys/lf-t.c have been adjusted accordingly.
      4075c52b
    • Mikael Ronstrom's avatar
    • Mikael Ronström's avatar
      merge · ecb3814b
      Mikael Ronström authored
      ecb3814b
    • Bjorn Munch's avatar
      null upmerge · 0b9682a0
      Bjorn Munch authored
      0b9682a0
    • Bjorn Munch's avatar
      merge from 5.1-mtr · db4ed175
      Bjorn Munch authored
      db4ed175
    • Bjorn Munch's avatar
      merge from 5.5-mtr · 0fb541fb
      Bjorn Munch authored
      0fb541fb
    • MySQL Build Team's avatar
      changed the VERSION tag to 14 · 33b015f3
      MySQL Build Team authored
      33b015f3
  6. 12 May, 2011 16 commits
  7. 11 May, 2011 1 commit
    • Luis Soares's avatar
      BUG#12416700 · efc20dca
      Luis Soares authored
      Automerged bzr bundle from bug report into latest mysql-5.5.
      efc20dca