1. 14 Jan, 2010 2 commits
  2. 13 Jan, 2010 13 commits
    • Kristofer Pettersson's avatar
      automerge · 48db75d8
      Kristofer Pettersson authored
      48db75d8
    • Kristofer Pettersson's avatar
      Bug#33982 debug assertion and crash reloading grant tables after sighup or kill · da877f64
      Kristofer Pettersson authored
      In certain rare cases when a process was interrupted
      during a FLUSH PRIVILEGES operation the diagnostic
      area would be set to an error state but the function
      responsible for the operation would still signal
      success. This would lead to a debug assertion error
      later on when the server would attempt to reset the
      DA before sending the error message.
      
      This patch fixes the issue by assuring that
      reload_acl_and_cache() always fails if an error
      condition is raised.
      
      The second issue was that a KILL could cause
      a console error message which referred to a DA
      state without first making sure that such a
      state existed.
      
      This patch fixes this issue in two different
      palces by first checking DA state before
      fetching the error message.
      
       
      da877f64
    • Martin Hansson's avatar
      Merge of fix for Bug#48157. · b9d37b83
      Martin Hansson authored
      b9d37b83
    • Ramil Kalimullin's avatar
      Auto-merge. · 18be529b
      Ramil Kalimullin authored
      18be529b
    • Ramil Kalimullin's avatar
      Auto-merge. · 032822a6
      Ramil Kalimullin authored
      032822a6
    • Georgi Kodinov's avatar
      merge · 748ff84e
      Georgi Kodinov authored
      748ff84e
    • Georgi Kodinov's avatar
      version change · b433f7f2
      Georgi Kodinov authored
      b433f7f2
    • Joerg Bruehe's avatar
      Automerge from parent - no conflicts. · 1e5d0f08
      Joerg Bruehe authored
      1e5d0f08
    • Georgi Kodinov's avatar
      merge 5.1-main to 5.1-bugteam · c3ba50ad
      Georgi Kodinov authored
      c3ba50ad
    • Ramil Kalimullin's avatar
      Auto-merge. · 14afe5c4
      Ramil Kalimullin authored
      14afe5c4
    • Sven Sandberg's avatar
      BUG#49222: Mark RAND() as unsafe · 94946c68
      Sven Sandberg authored
      Problem: When RAND() is binlogged in statement mode, the seed is
      binlogged too, so the replication slave generates the same
      sequence of random numbers. This makes replication work in many
      cases, but not in all cases: the order of rows is not guaranteed
      for, e.g., UPDATE or INSERT...SELECT statements, so the row data
      will be different if master and slave retrieve the rows in
      different orders.
      Fix: Mark RAND() as unsafe. It will generate a warning if
      binlog_format=STATEMENT and switch to row-logging if
      binlog_format=ROW.
      94946c68
    • Ramil Kalimullin's avatar
      Fix for bug#50227: Pre-auth buffer-overflow in mySQL through yaSSL · 5622b586
      Ramil Kalimullin authored
      Problem: copying issuer's (or subject's) name tags into an internal
      buffer from incoming stream we didn't check the buffer overflow. 
      That may lead to memory overrun, crash etc.
      
      Fix: ensure we don't overrun the buffer.
      
      Note: there's no simple test case (exploit needed).
      5622b586
    • Gleb Shchepa's avatar
      Bug #50096: CONCAT_WS inside procedure returning wrong data · 30212033
      Gleb Shchepa authored
      Selecting of the CONCAT_WS(...<PS parameter>...) result into
      a user variable may return wrong data.
      
      Item_func_concat_ws::val_str contains a number of memory
      allocation-saving optimization tricks. After the fix
      for bug 46815 the control flow has been changed to a
      branch that is commented as "This is quite uncommon!":
      one of places where we are trying to concatenate
      strings inplace. However, that "uncommon" place
      didn't care about PS parameters, that have another
      trick in Item_sp_variable::val_str(): they use the
      intermediate Item_sp_variable::str_value field,
      where they may store a reference to an external
      argument's buffer.
      
      The Item_func_concat_ws::val_str function has been
      modified to take into account val_str functions
      (such as Item_sp_variable::val_str) that return a
      pointer to an internal Item member variable that
      may reference to a buffer provided.
      30212033
  3. 12 Jan, 2010 4 commits
    • Martin Hansson's avatar
      Bug#48157: crash in Item_field::used_tables · e57ea46d
      Martin Hansson authored
      MySQL handles the join syntax "JOIN ... USING( field1,
      ... )" and natural joins by building the same parse tree as
      a corresponding join with an "ON t1.field1 = t2.field1 ..."
      expression would produce. This parse tree was not cleaned up
      properly in the following scenario. If a thread tries to
      lock some tables and finds that the tables were dropped and
      re-created while waiting for the lock, it cleans up column
      references in the statement by means a per-statement free
      list. But if the statement was part of a stored procedure,
      column references on the stored procedure's free list weren't
      cleaned up and thus contained pointers to freed objects.
      
      Fixed by adding a call to clean up the current prepared
      statement's free list.
      e57ea46d
    • Joerg Bruehe's avatar
      Upmerge the changes for RPM versioning/naming from 5.0 to 5.1. · b0dad6ed
      Joerg Bruehe authored
      This includes "MYSQL_U_SCORE_VERSION" in "configure.in".
      b0dad6ed
    • Joerg Bruehe's avatar
      Implement the change of RPM versioning and file naming: · 789352e8
      Joerg Bruehe authored
      - "release" starts from 1
      - "level" ("m2", "rc", ...) is included in the RPM version.
      789352e8
    • Joerg Bruehe's avatar
      Merge from main tree, · 685166a5
      Joerg Bruehe authored
      but don't take the "tree name" change.
      685166a5
  4. 11 Jan, 2010 3 commits
  5. 08 Jan, 2010 2 commits
    • 's avatar
      Postfix · 2ae528aa
      authored
      Recover the right contents of the index file at the end of the test case.
      2ae528aa
    • 's avatar
      BUG #28421 Infinite loop on slave relay logs · 8c677779
      authored
      Manually deleteing one or more entries from 'master-bin.index', will
      cause master infinitely loop to send one binlog file. 
      
      When starting a dump session, master opens index file and search the binlog file
      which is being requested by the slave. The position of the binlog file in the
      index file is recorded. it will be used to find the next binlog file when current
      binlog file has dumped completely. As only the position is used, it may
      not get the correct file if some entries has been removed manually from the index file.
      the master will reopen the current binlog file which has been dump completely
      and redump it if it can not get the next binlog file's name from index file.
      It obviously is a logical error.
      
      
      Even though it is allowed to manually change index file,
      but it is not recommended. so after this patch, master
      sends a fatal error to slave and close the dump session if a new binlog file
      has been generated and master can not get it from the index file.
      8c677779
  6. 07 Jan, 2010 2 commits
  7. 06 Jan, 2010 6 commits
  8. 05 Jan, 2010 1 commit
  9. 31 Dec, 2009 2 commits
    • 's avatar
      Bug #49137 Replication failure on SBR/MBR + multi-table DROP TEMPORARY TABLE · dbe02e6d
      authored
            
      In statement-based or mixed-mode replication, use DROP TEMPORARY TABLE
      to drop multiple tables causes different errors on master and slave, 
      when one or more of these tables do not exist. Because when executed
      on slave, it would automatically add IF EXISTS to the query to ignore
      all ER_BAD_TABLE_ERROR errors.
      
      To fix the problem, do not add IF EXISTS when executing DROP TEMPORARY
      TABLE on the slave, and clear the ER_BAD_TABLE_ERROR error after
      execution if the query does not expect any errors.
      dbe02e6d
    • 's avatar
      Bug #49137 Replication failure on SBR/MBR + multi-table DROP TEMPORARY TABLE · ccc3a468
      authored
            
      In statement-based or mixed-mode replication, use DROP TEMPORARY TABLE
      to drop multiple tables causes different errors on master and slave, 
      when one or more of these tables do not exist. Because when executed
      on slave, it would automatically add IF EXISTS to the query to ignore
      all ER_BAD_TABLE_ERROR errors.
      
      To fix the problem, do not add IF EXISTS when executing DROP TEMPORARY
      TABLE on the slave, and clear the ER_BAD_TABLE_ERROR error after
      execution if the query does not expect any errors.
      ccc3a468
  10. 30 Dec, 2009 2 commits
  11. 26 Dec, 2009 2 commits
  12. 24 Dec, 2009 1 commit