1. 07 Jul, 2010 2 commits
    • Jon Olav Hauglid's avatar
      manual merge from mysql-5.1-security · 4c174b62
      Jon Olav Hauglid authored
      4c174b62
    • Jon Olav Hauglid's avatar
      Bug #54117 crash in thr_multi_unlock, temporary table · 60edcf94
      Jon Olav Hauglid authored
      This crash occured after ALTER TABLE was used on a temporary
      transactional table locked by LOCK TABLES. Any later attempts to
      execute LOCK/UNLOCK TABLES, caused the server to crash.
      
      The reason for the crash was the list of locked tables would
      end up having a pointer to a free'd table instance. This happened
      because ALTER TABLE deleted the table without also removing the
      table reference from the locked tables list.
      
      This patch fixes the problem by making sure ALTER TABLE also
      removes the table from the locked tables list.
      
      Test case added to innodb_mysql.test.
      60edcf94
  2. 06 Jul, 2010 1 commit
  3. 05 Jul, 2010 6 commits
  4. 04 Jul, 2010 6 commits
    • 's avatar
      Manual merge · b8671789
      authored
      b8671789
    • 's avatar
      Postfix for bug#48321 · 363a2ccc
      authored
      Some test cases set ANSI_QUOTES in sql_mode.
      So we have to use single quotes to quote literal strings.
      363a2ccc
    • Vasil Dimov's avatar
      Null-merge mysql-5.1-innodb -> mysql-trunk-innodb up to · e70e5b0a
      Vasil Dimov authored
      sunny.bains@oracle.com-20100625081841-ppulnkjk1qlazh82
      e70e5b0a
    • Vasil Dimov's avatar
      Merge mysql-5.1-innodb -> mysql-5.1-security · 0b0c18a0
      Vasil Dimov authored
      Merge up to sunny.bains@oracle.com-20100625081841-ppulnkjk1qlazh82 .
      There are 8 more changesets in mysql-5.1-innodb, but PB2 shows a
      failure for a test added in one of them. If that is resolved quickly
      then those 8 more changesets will be merged too.
      0b0c18a0
    • 's avatar
      Manul merge · fe6ab9a0
      authored
      fe6ab9a0
    • 's avatar
      The following statements support the CURRENT_USER() where a user is needed. · 42eecc53
      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.
      42eecc53
  5. 03 Jul, 2010 4 commits
  6. 02 Jul, 2010 12 commits
  7. 01 Jul, 2010 6 commits
  8. 30 Jun, 2010 3 commits