1. 22 Jul, 2011 8 commits
  2. 21 Jul, 2011 1 commit
    • Jon Olav Hauglid's avatar
      Bug#12779790 COMPILATION FAILS OS X 10.7 - IMPLICIT DECLARATION OF · 96a2bbcb
      Jon Olav Hauglid authored
                   FUNCTION 'PTHREAD_INIT' 
      
      The problem was that compilation would fail with a warning:
      Implicit declaration of function 'pthread_init' if MySQL was
      compiled on OS X 10.7 (Lion). The reason was that pthread_init()
      is now part of an internal OS X pthread library so it was found
      by CMake.
      
      This patch fixes the problem by removing HAVE_PTHREAD_INIT and
      related code. pthread_init() was specific to MIT-pthreads which
      has not been supported since 4.1 and was therefore no longer
      relevant.
      
      No test case added.
      96a2bbcb
  3. 20 Jul, 2011 3 commits
  4. 19 Jul, 2011 3 commits
  5. 18 Jul, 2011 6 commits
  6. 15 Jul, 2011 7 commits
  7. 14 Jul, 2011 3 commits
    • Luis Soares's avatar
      BUG#11753004 · 7168be4e
      Luis Soares authored
      Manual merge from mysql-5.1 into mysql-5.5.
      7168be4e
    • Luis Soares's avatar
      BUG#11753004: 44360: REPLICATION FAILED · ce8077d8
      Luis Soares authored
                        
      The server crashes if it processes table map events that are
      corrupted, especially if they map different tables to the same
      identifier. This could happen, for instance, due to BUG 56226.
                        
      We fix this by checking whether the table map has already been
      mapped before actually applying the event. If it has been mapped
      with different settings an error is raised and the slave SQL
      thread stops. If it has been mapped with same settings the event
      is skipped. If the table is set to be ignored by the filtering
      rules, there is no change in behavior: the event is skipped and
      ids are not checked.
      ce8077d8
    • Anitha Gopi's avatar
      Bug#12561297 : Disabled the test · 73340d03
      Anitha Gopi authored
      73340d03
  8. 13 Jul, 2011 1 commit
  9. 12 Jul, 2011 3 commits
    • Luis Soares's avatar
      BUG#12695969 · d64648d8
      Luis Soares authored
        
      Automerged from mysql-5.1 into mysql-5.5 (empty cset).
      d64648d8
    • Luis Soares's avatar
      BUG#12695969 · 93aba6e6
      Luis Soares authored
      Manually merged from mysql-5.0 into mysql-5.1.
      
      conflicts
      =========
      
      include/Makefile.am
      93aba6e6
    • Luis Soares's avatar
      BUG#12695969 · eae6fde7
      Luis Soares authored
      Follow-up patch that adds the newly added header file to
      Makefile.am noinst_HEADERS.
      eae6fde7
  10. 11 Jul, 2011 3 commits
    • Luis Soares's avatar
      BUG#12695969 · 20144800
      Luis Soares authored
      Manually merged from mysql-5.1:
      
        - fixed mysqlbinlog copyright year: 2001 --> 2000
        - fixed address in license header
      
      conflicts
      =========
      
       - client/mysqlbinlog.cc
       - include/welcome_copyright_notice.h
      20144800
    • Luis Soares's avatar
      BUG#12695969 · d3324c00
      Luis Soares authored
      Manually merged mysql-5.0 into mysql-5.1.
      
      conflicts
      =========
      client/mysqlibinlog.cc
      d3324c00
    • Luis Soares's avatar
      BUG#12695969: FIX OUTDATED COPYRIGHT NOTICES IN REPLACTION · cc17ce72
      Luis Soares authored
      CLIENT TOOLS
            
      The fix is to backport part of revision:
              
        - alexander.nozdrin@oracle.com-20101006150613-ls60rb2tq5dpyb5c
            
      from mysql-5.5. In detail, we add the oracle welcome notice
      header file proposed in the original patch and include/use it
      in client/mysqlbinlog.cc, replacing the existing and obsolete
      notice.
      cc17ce72
  11. 08 Jul, 2011 1 commit
    • kevin.lewis@oracle.com's avatar
      Null Merge from mysql-5.1 with second fix for Bug#12637786 · 1f844faa
      kevin.lewis@oracle.com authored
      Bug#12637786 was fixed with rb:692 by marko.  But that fix has a remaining
      bug.  It added this assert;
          ut_ad(ind_field->prefix_len);
      before a section of code that assumes there is a prefix_len.  
      
      The patch replaced code that explicitly avoided this with a check for
      prefix_len.  It turns out that the purge thread can get to that assert
      without a prefix_len because it does not use a row_ext_t* .
      When UNIV_DEBUG is not defined, the affect of this is that the purge thread
      sets the dfield->len to zero and then cannot find the entry in the index to
      purge.  So secondary index entries remain unpurged.
      
      This patch does not do the assert.  Instead, it uses
          'if (ind_field->prefix_len) {...}'
      around the section of code that assumes a prefix_len.  This is the way the
      patch I provided to Marko did it.
      
      The test case is simply modified to do a sleep(10) in order to give the
      purge thread a chance to run. Without the code change to row0row.c, this
      modified testcase will assert if InnoDB was compiled with UNIV_DEBUG.
      I tried to sleep(5), but it did not always assert.
      1f844faa
  12. 07 Jul, 2011 1 commit
    • kevin.lewis@oracle.com's avatar
      Bug#12637786 was fixed with rb:692 by marko. But that fix has a remaining · e3fab622
      kevin.lewis@oracle.com authored
      bug.  It added this assert;
          ut_ad(ind_field->prefix_len);
      before a section of code that assumes there is a prefix_len.  
      
      The patch replaced code that explicitly avoided this with a check for
      prefix_len.  It turns out that the purge thread can get to that assert
      without a prefix_len because it does not use a row_ext_t* .
      When UNIV_DEBUG is not defined, the affect of this is that the purge thread
      sets the dfield->len to zero and then cannot find the entry in the index to
      purge.  So secondary index entries remain unpurged.
      
      This patch does not do the assert.  Instead, it uses
          'if (ind_field->prefix_len) {...}'
      around the section of code that assumes a prefix_len.  This is the way the
      patch I provided to Marko did it.
      
      The test case is simply modified to do a sleep(10) in order to give the
      purge thread a chance to run. Without the code change to row0row.c, this
      modified testcase will assert if InnoDB was compiled with UNIV_DEBUG.
      I tried to sleep(5), but it did not always assert.
      e3fab622