1. 28 Jun, 2010 8 commits
  2. 27 Jun, 2010 4 commits
    • Alfranio Correia's avatar
      null-merge · 0fadb6d2
      Alfranio Correia authored
      0fadb6d2
    • Alfranio Correia's avatar
      353e1107
    • 's avatar
      Manual merge · c943bc7b
      authored
      c943bc7b
    • 's avatar
      The following statements support the CURRENT_USER() where a user is needed. · 899a1d69
      authored
      DROP USER 
      RENAME USER CURRENT_USER() ...
      GRANT ... TO CURRENT_USER()
      REVOKE ... FROM CURRENT_USER()
      ALTER DEFINER = CURRENT_USER() EVENTbut, When these statements are binlogged, CURRENT_USER() just is binlogged
      as 'CURRENT_USER()', it is not expanded to the real user name. When slave 
      executes the log event, 'CURRENT_USER()' is expand to the user of slave 
      SQL thread, but SQL thread's user name always NULL. This breaks the replication.
      
      After this patch, session's user will be written into query log events 
      if these statements call CURREN_USER() or 'ALTER EVENT' does not assign a definer.
      899a1d69
  3. 26 Jun, 2010 3 commits
    • Jon Olav Hauglid's avatar
      null-merge from mysql-5.1-bugteam. · f8f7a704
      Jon Olav Hauglid authored
      f8f7a704
    • Jon Olav Hauglid's avatar
      Bug #54360 Deadlock DROP/ALTER/CREATE DATABASE with open HANDLER · 9fa66b64
      Jon Olav Hauglid authored
      This deadlock happened if DROP DATABASE was blocked due to an open
      HANDLER table from a different connection. While DROP DATABASE
      is blocked, it holds the LOCK_mysql_create_db mutex. This results
      in a deadlock if the connection with the open HANDLER table tries
      to execute a CREATE/ALTER/DROP DATABASE statement as they all
      try to acquire LOCK_mysql_create_db.
      
      This patch makes this deadlock scenario very unlikely by closing and
      marking for re-open all HANDLER tables for which there are pending
      conflicing locks, before LOCK_mysql_create_db is acquired.
      However, there is still a very slight possibility that a connection
      could access one of these HANDLER tables between closing/marking for
      re-open and the acquisition of LOCK_mysql_create_db.
      
      This patch is for 5.1 only, a separate and complete fix will be
      made for 5.5+.
      
      Test case added to schema.test.
      9fa66b64
    • Alexander Nozdrin's avatar
      Auto-merge from mysql-trunk. · 78413326
      Alexander Nozdrin authored
      78413326
  4. 25 Jun, 2010 4 commits
  5. 24 Jun, 2010 13 commits
  6. 23 Jun, 2010 2 commits
  7. 22 Jun, 2010 4 commits
    • Alexey Kopytov's avatar
      Bug#54477: Crash on IN / CASE with NULL arguments · 07e95b39
      Alexey Kopytov authored
      Incorrect handling of NULL arguments could lead to a crash on
      the IN or CASE operations when either NULL arguments were
      passed explicitly as arguments (IN) or implicitly generated by
      the WITH ROLLUP modifier (both IN and CASE).
      
      Item_func_case::find_item() assumed all necessary comparators
      to be instantiated in fix_length_and_dec(). However, in the
      presence of WITH ROLLUP modifier, arguments could be
      substituted with an Item_null leading to an "unexpected"
      STRING_RESULT comparator being invoked.
      
      In addition to the problem identical to the above,
      Item_func_in::val_int() could crash even with explicitly passed
      NULL arguments due to an optimization in fix_length_and_dec()
      leading to NULL arguments being ignored during comparators
      creation.
      07e95b39
    • Vasil Dimov's avatar
      Merge mysql-trunk -> mysql-trunk-merge · 149d3054
      Vasil Dimov authored
      149d3054
    • Alexander Nozdrin's avatar
      Auto-merge from mysql-trunk-bugfixing. · 13495fae
      Alexander Nozdrin authored
      13495fae
    • Magne Mahre's avatar
      Post-push fixups for WL#5349 · b4f77c40
      Magne Mahre authored
      b4f77c40
  8. 21 Jun, 2010 2 commits