1. 05 Jul, 2010 4 commits
  2. 04 Jul, 2010 5 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
    • '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
  3. 03 Jul, 2010 4 commits
  4. 02 Jul, 2010 7 commits
  5. 01 Jul, 2010 6 commits
  6. 30 Jun, 2010 4 commits
    • Sergey Glukhov's avatar
      5.1-bugteam->trunk-merge merge · b71629a3
      Sergey Glukhov authored
      b71629a3
    • Sergey Glukhov's avatar
      Bug#51431 Wrong sort order after import of dump file · a6220d82
      Sergey Glukhov authored
      The problem is that QUICK_SELECT_DESC behaviour depends
      on used_key_parts value which can be bigger than selected
      best_key_parts value if an engine supports clustered key.
      But used_key_parts is overwritten with best_key_parts
      value that prevents from correct selection of index
      access method. The fix is to preserve used_key_parts
      value for further use in QUICK_SELECT_DESC.
      a6220d82
    • Staale Smedseng's avatar
      Automerge · 1ceb1d1b
      Staale Smedseng authored
      1ceb1d1b
    • Staale Smedseng's avatar
      Bug #53899 Wrong mysql_stmt_errno() after connection loss with · 3b3983a4
      Staale Smedseng authored
      automatic reconnect
      
      A client with automatic reconnect enabled will see the error
      message "Lost connection to MySQL server during query" if the
      connection is lost between mysql_stmt_prepare() and
      mysql_stmt_execute(). The mysql_stmt_errno() number, however,
      is 0 -- not the corresponding value 2013.
      
      This patch checks for the case where the prepared statement
      has been pruned due to a connection loss (i.e., stmt->mysql
      has been set to NULL) during a call to cli_advanced_command(),
      and avoids changing the last_errno to the result of the last
      reconnect attempt.
      3b3983a4
  7. 29 Jun, 2010 2 commits
  8. 28 Jun, 2010 8 commits