1. 24 Jul, 2009 7 commits
  2. 23 Jul, 2009 2 commits
    • Staale Smedseng's avatar
      Merge from 5.0 · 47a9a252
      Staale Smedseng authored
      47a9a252
    • Staale Smedseng's avatar
      Bug #45770 errors reading server SSL files are printed, but · 63ab8415
      Staale Smedseng authored
      not logged
              
      Errors encountered during initialization of the SSL subsystem
      are printed to stderr, rather than to the error log.
              
      This patch adds a parameter to several SSL init functions to
      report the error (if any) out to the caller. The function
      init_ssl() in mysqld.cc is moved after the initialization of
      the log subsystem, so that any error messages can be logged to
      the error log. Printing of messages to stderr has been 
      retained to get diagnostic output in a client context.
      63ab8415
  3. 22 Jul, 2009 1 commit
  4. 19 Jul, 2009 3 commits
  5. 18 Jul, 2009 3 commits
  6. 17 Jul, 2009 5 commits
  7. 16 Jul, 2009 10 commits
  8. 15 Jul, 2009 9 commits
    • Kristofer Pettersson's avatar
      Bug#45781 infinite hang/crash in "opening tables" after handler tries to open merge · c9df2a13
      Kristofer Pettersson authored
                table
      
      The MERGE table storage engine does not support the HA_CAN_SQL_HANDLE feature
      and any attempt to open the merge table will fail with ER_ILLEGAL_HA.
      
      After an error occurred the tables that was opened must be closed again
      or they will be left in an inconsistent state. However, the assumption
      made in the code for closing and register handler tables was that only
      one table will be opened, and this is not true for MERGE tables which
      will cause multiple tables to open.
      
      The next time a SELECT operation was issued on the merge table it
      caused the system to freeze.
      
      This patch fixes this issue by making sure that all tables which
      are opened also are closed in the event of an error.
      c9df2a13
    • Davi Arnaut's avatar
      Bug#44495: Prepared Statement: CALL p(<x>) - `thd->protocol == &thd->protocol_text' failed · 0830a3be
      Davi Arnaut authored
      Merge Konstantin's patch and add a test case.
      0830a3be
    • Konstantin Osipov's avatar
      A fix for Bug#44495 "Prepared Statement: CALL p(<x>) - `thd->protocol == &thd->protocol_text' · e601194c
      Konstantin Osipov authored
      failed"
      
      Do not assume that SQL prepared statements always run in text protocol.
      When invoked from a stored procedure, which is itself invoked
      by means of prepared CALL statement, the protocol may be binary.
      Juggle with the protocol only when we want to change it
      to binary in COM_STMT_EXECUTE, COM_STMT_PREPARE.
      
      This is a backport from 5.4/6.0, where the bug was fixed
      as part of WL#4264 "Backup: Stabilize Service Interface" 
      e601194c
    • Georgi Kodinov's avatar
      automerge · 1b7754a5
      Georgi Kodinov authored
      1b7754a5
    • Georgi Kodinov's avatar
      Bug #45287: phase 1 : 32 bit compilation warnings · 8acf778e
      Georgi Kodinov authored
      Fixed the following problems:
      1. cmake 2.6 warning because of a changed default on
      how the dependencies to libraries with a specified 
      path are resolved.
      Fixed by requiring cmake 2.6.
      2. Removed an obsolete pre-NT4 hack including defining
      Windows system defines to alter the behavior of windows.h.
      3. Disabled warning C4065 on compiling sql_yacc.cc because
      of a know incompatibility in some of the newer bison binaries.
      8acf778e
    • Ramil Kalimullin's avatar
      bb4f24bf
    • Anurag Shekhar's avatar
      merging with 5.0 bugteam tree · 064c990b
      Anurag Shekhar authored
      064c990b
    • Anurag Shekhar's avatar
      Bug#37740 Server crashes on execute statement with full text search and · 7c670fc3
      Anurag Shekhar authored
                match against.
      
      
      Server crashes when executing prepared statement with duplicating
      MATCH() function calls in SELECT and ORDER BY expressions, e.g.:
      SELECT MATCH(a) AGAINST('test') FROM t1 ORDER BY MATCH(a) AGAINST('test')
      
      This query gets optimized by the server, so the value returned
      by MATCH() from the SELECT list is reused for ORDER BY purposes.
      To make this optimization server is comparing items from
      SELECT and ORDER BY lists. We were getting server crash because
      comparision function for MATCH() item is not intended to be called
      at this point of execution.
      
      In 5.0 and 5.1 this problem is workarounded by resetting MATCH()
      item to the state as it was during PREPARE.
      
      In 6.0 correct comparision function will be implemented and
      duplicating MATCH() items from the ORDER BY list will be
      optimized.
      7c670fc3
    • Ramil Kalimullin's avatar
      Auto-merge · 7a305e31
      Ramil Kalimullin authored
      7a305e31