1. 28 Jul, 2011 3 commits
  2. 22 Jul, 2011 8 commits
  3. 21 Jul, 2011 1 commit
    • Jon Olav Hauglid's avatar
      Bug#12779790 COMPILATION FAILS OS X 10.7 - IMPLICIT DECLARATION OF · 2c1c172f
      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.
      2c1c172f
  4. 20 Jul, 2011 3 commits
  5. 19 Jul, 2011 3 commits
  6. 18 Jul, 2011 6 commits
    • Alfranio Correia's avatar
      BUG#11809016 - NO WAY TO DISCOVER AN INSTANCE IS NO LONGER A SLAVE FOLLOWING MYSQL BUG#28796 · 4317cc3d
      Alfranio Correia authored
      Before BUG#28796, an empty host was used to identify that an instance was no
      longer a slave. However, BUG#28796 changed this behavior and one cannot set
      an empty host. Besides, a RESET SLAVE only cleans up information on the next
      event to retrieve from the master, disables ssl and resets heartbeat period.
      So a call to SHOW SLAVE STATUS after issuing a RESET SLAVE still returns some
      valid information, such as host, port, user and password.
      
      To fix this problem, we have introduced the command RESET SLAVE ALL that does
      what a regular RESET SLAVE does and also clears host, port, user and password
      information thus allowing users to identify when an instance is no longer a
      slave.
      4317cc3d
    • Bjorn Munch's avatar
      null upmerge · 39e8bb5e
      Bjorn Munch authored
      39e8bb5e
    • Bjorn Munch's avatar
      merge from 5.5-mtr · 799b9f0b
      Bjorn Munch authored
      799b9f0b
    • Tor Didriksen's avatar
      Bug#12711164 - 61676: RESULT OF DIV WITH DECIMAL AND INTEGER DOES NOT MAKE SENSE · ae76b743
      Tor Didriksen authored
      Truncate result of decimal division before converting to integer.
      
      
      mysql-test/r/func_math.result:
        New test case.
      mysql-test/t/func_math.test:
        New test case.
      sql/item_func.cc:
        Item_func_int_div::val_int():
        Truncate result of decimal division before converting to integer.
      ae76b743
    • Bjorn Munch's avatar
      merge from 5.1-mtr · 94d6fc52
      Bjorn Munch authored
      94d6fc52
    • Tor Didriksen's avatar
      Bug#12537160 ASSERTION FAILED: STOP0 <= &TO->BUF[TO->LEN] WITH LARGE NUMBER. · fe57d0d5
      Tor Didriksen authored
      Turns out the DBUG_ASSERT added by fix for Bug#11792200 was overly pessimistic:
      'stop0' is used in the main loop of do_div_mod, but we only dereference 'buf0'
      for div operations, not for mod.
      
      
      mysql-test/r/func_math.result:
        New test case.
      mysql-test/t/func_math.test:
        New test case.
      strings/decimal.c:
        Move DBUG_ASSERT down to where we actually dereference the loop pointer.
      fe57d0d5
  7. 15 Jul, 2011 7 commits
  8. 14 Jul, 2011 3 commits
    • Luis Soares's avatar
      BUG#11753004 · 55fbe4c3
      Luis Soares authored
      Manual merge from mysql-5.1 into mysql-5.5.
      55fbe4c3
    • Luis Soares's avatar
      BUG#11753004: 44360: REPLICATION FAILED · 1b1e1e05
      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)
      1b1e1e05
    • Anitha Gopi's avatar
      Bug#12561297 : Disabled the test · c84fac29
      Anitha Gopi authored
      c84fac29
  9. 13 Jul, 2011 1 commit
  10. 12 Jul, 2011 3 commits
    • Luis Soares's avatar
      BUG#12695969 · d0b76217
      Luis Soares authored
        
      Automerged from mysql-5.1 into mysql-5.5 (empty cset).
      d0b76217
    • Luis Soares's avatar
      BUG#12695969 · 9c4287f4
      Luis Soares authored
      Manually merged from mysql-5.0 into mysql-5.1.
      
      conflicts
      =========
      
      include/Makefile.am
      9c4287f4
    • Luis Soares's avatar
      BUG#12695969 · 34d33506
      Luis Soares authored
      Follow-up patch that adds the newly added header file to
      Makefile.am noinst_HEADERS.
      34d33506
  11. 11 Jul, 2011 2 commits
    • Luis Soares's avatar
      BUG#12695969 · 00c3b2e6
      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
      00c3b2e6
    • Luis Soares's avatar
      BUG#12695969 · 39f76b60
      Luis Soares authored
      Manually merged mysql-5.0 into mysql-5.1.
      
      conflicts
      =========
      client/mysqlibinlog.cc
      39f76b60