1. 22 Jul, 2011 1 commit
  2. 15 Jul, 2011 7 commits
  3. 14 Jul, 2011 3 commits
    • Luis Soares's avatar
      BUG#11753004 · 0caa1960
      Luis Soares authored
      Manual merge from mysql-5.1 into mysql-5.5.
      0caa1960
    • Luis Soares's avatar
      BUG#11753004: 44360: REPLICATION FAILED · bf7d414b
      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.
      
      
      mysql-test/suite/rpl/t/rpl_row_corruption.test:
        Added a simple test case that checks both cases:
        - multiple table maps with the same identifier
        - multiple table maps with the same identifier, but only one
          is processed (the others are filtered out)
      bf7d414b
    • Anitha Gopi's avatar
      Bug#12561297 : Disabled the test · c09c4c3a
      Anitha Gopi authored
      c09c4c3a
  4. 13 Jul, 2011 1 commit
  5. 12 Jul, 2011 3 commits
    • Luis Soares's avatar
      BUG#12695969 · c5fb3794
      Luis Soares authored
        
      Automerged from mysql-5.1 into mysql-5.5 (empty cset).
      c5fb3794
    • Luis Soares's avatar
      BUG#12695969 · 624ed50e
      Luis Soares authored
      Manually merged from mysql-5.0 into mysql-5.1.
      
      conflicts
      =========
      
      include/Makefile.am
      624ed50e
    • Luis Soares's avatar
      BUG#12695969 · b9dd956a
      Luis Soares authored
      Follow-up patch that adds the newly added header file to
      Makefile.am noinst_HEADERS.
      b9dd956a
  6. 11 Jul, 2011 3 commits
    • Luis Soares's avatar
      BUG#12695969 · 25df7550
      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
      25df7550
    • Luis Soares's avatar
      BUG#12695969 · e018925a
      Luis Soares authored
      Manually merged mysql-5.0 into mysql-5.1.
      
      conflicts
      =========
      client/mysqlibinlog.cc
      e018925a
    • Luis Soares's avatar
      BUG#12695969: FIX OUTDATED COPYRIGHT NOTICES IN REPLACTION · 686182b2
      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.
      686182b2
  7. 08 Jul, 2011 1 commit
    • unknown's avatar
      Null Merge from mysql-5.1 with second fix for Bug#12637786 · 438d2118
      unknown 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.
      438d2118
  8. 07 Jul, 2011 6 commits
    • unknown's avatar
      Bug#12637786 was fixed with rb:692 by marko. But that fix has a remaining · 6cc0f6a2
      unknown 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.
      6cc0f6a2
    • Joerg Bruehe's avatar
      Upmerge the 45415 fix from 5.1 to 5.5 · 8cf0ebca
      Joerg Bruehe authored
      8cf0ebca
    • Joerg Bruehe's avatar
      Fix bug#45415: "rpm upgrade recreates test database" · c6669b46
      Joerg Bruehe authored
      Let the creation of the "test" database happen only during a new
      installation, not in an RPM upgrade.
      c6669b46
    • Davi Arnaut's avatar
      Bug#12727287: Maintainer mode compilation fails with gcc 4.6 · 71e0ff64
      Davi Arnaut authored
      GCC 4.6 has new -Wunused-but-set-variable flag, which is enabled
      by -Wall, that causes GCC to emit a warning whenever a local variable
      is assigned to, but otherwise unused (aside from its declaration).
      
      Since the maintainer mode uses -Wall and -Werror, source code which
      triggers these warnings will be rejected. That is, these warnings
      become hard errors.
      
      The solution is to fix the code which triggers these specific warnings.
      In most of the cases, this is a welcome cleanup as code which triggers
      this warning is probably dead anyway.
      
      dbug/dbug.c:
        Unused but set.
      libmysqld/lib_sql.cc:
        Length is not necessary as the converted error message is always
        null-terminated.
      sql/item_func.cc:
        Make get_var_with_binlog private to this compilation unit.
        If a error was raised, do not attempt to evaluate the user
        variable as the statement execution will be interrupted
        anyway.
      sql/mysqld.cc:
        Use a void expression to silence the warning. Avoids the use of
        macros that would make the code more unreadable than it already is.
      sql/protocol.cc:
        Length is not necessary as the converted error message is always
        null-terminated. Remove unnecessary casts and assignment.
      sql/sql_class.h:
        Function is only used in a single compilation unit.
      sql/sql_load.cc:
        Only use the variable outside of EMBEDDED_LIBRARY.
      storage/innobase/btr/btr0cur.c:
        Do not retrieve field, only the record length is being used.
      storage/perfschema/pfs.cc:
        Use a void expression to silence the warning.
      tests/mysql_client_test.c:
        Unused but set.
      unittest/mysys/lf-t.c:
        Unused but set.
      71e0ff64
    • Georgi Kodinov's avatar
      merge mysql-5.1->mysql-5.5 · 21d088e4
      Georgi Kodinov authored
      21d088e4
    • Georgi Kodinov's avatar
      empty weave merge from mysql-5.0 · bb5e014a
      Georgi Kodinov authored
      bb5e014a
  9. 06 Jul, 2011 1 commit
  10. 05 Jul, 2011 2 commits
  11. 04 Jul, 2011 5 commits
  12. 03 Jul, 2011 4 commits
  13. 01 Jul, 2011 3 commits