1. 21 Apr, 2011 4 commits
  2. 20 Apr, 2011 6 commits
  3. 18 Apr, 2011 6 commits
  4. 16 Apr, 2011 3 commits
  5. 15 Apr, 2011 9 commits
    • Bjorn Munch's avatar
      null upmerge · ae145b6d
      Bjorn Munch authored
      ae145b6d
    • Bjorn Munch's avatar
      merge from 5.5 main · f3203f5a
      Bjorn Munch authored
      f3203f5a
    • Bjorn Munch's avatar
      merge from 5.1 main · 19add93d
      Bjorn Munch authored
      19add93d
    • Alexander Nozdrin's avatar
      A patch for Bug#11763166 (55847: SHOW WARNINGS returns empty · 506ff594
      Alexander Nozdrin authored
      result set when SQLEXCEPTION is active.
      
      The problem was in a hackish THD::no_warnings_for_error attribute.
      When it was set, an error was not written to Warning_info -- only
      Diagnostics_area state was changed. That means, Diagnostics_area
      might contain error state, which is not present in Warning_info.
      
      The user-visible problem was that in some cases SHOW WARNINGS
      returned empty result set (i.e. there were no warnings) while
      the previous SQL statement failed. According to the MySQL
      protocol errors must be presented in warning list.
      
      The main idea of this patch is to remove THD::no_warnings_for_error.
      There were few places where it was used:
        - sql_admin.cc, handling of REPAIR TABLE USE_FRM.
        - sql_show.cc, when calling fill_schema_table_from_frm().
        - sql_show.cc, when calling fill_table().
      The fix is to either use internal-error-handlers, or to use
      temporary Warning_info storing warnings, which might be ignored.
      
      This patch is needed to fix Bug 11763162 (55843).
      506ff594
    • Sergey Glukhov's avatar
      5.1 -> 5.5 merge · df28a9d8
      Sergey Glukhov authored
      df28a9d8
    • Sergey Glukhov's avatar
      Bug#11765139 58069: LOAD DATA INFILE: VALGRIND REPORTS INVALID MEMORY READS AND WRITES WITH U · 12a6e0d9
      Sergey Glukhov authored
      Some multibyte sequences could be considered by my_mbcharlen() functions
      as multibyte character but more exact my_ismbchar() does not think so.
      In such a case this multibyte sequences is pushed into 'stack' buffer which
      is too small to accommodate the sequence.
      The fix is to allocate stack buffer in
      compliance with max character length.
      12a6e0d9
    • Bjorn Munch's avatar
      upmerge 12351213,12360195 · af6a02c7
      Bjorn Munch authored
      af6a02c7
    • Bjorn Munch's avatar
      Bug #12360195 MTR DOES NOT IGNORE TABS IN EXPERIMENTAL FILE · 331058bc
      Bjorn Munch authored
      Instead of just filtering space, filter white space (\s)
      I left the default.experimental file as is, with tabs.
      331058bc
    • Tor Didriksen's avatar
      Merge fix for Bug#11765713 from 5.1 · 73c8173f
      Tor Didriksen authored
      73c8173f
  6. 14 Apr, 2011 10 commits
    • Tor Didriksen's avatar
      Bug#11765713 58705: OPTIMIZER LET ENGINE DEPEND ON UNINITIALIZED VALUES CREATED BY OPT_SUM_QU · 2af655c2
      Tor Didriksen authored
      Valgrind warnings were caused by comparing index values to an un-initialized field.
      2af655c2
    • Bjorn Munch's avatar
      Bug #12351213 MTR --VS-CONFIG DOES NOT WORK LIKE MTR_VS_CONFIG · a23276c5
      Bjorn Munch authored
      Fix for --vs-config applied
      Find.pm incorrectly tested an unitialized local variable instead
        of the global, corrected.
      Find.pm is also wrong in 5.5: uses a non-existent global variable. Fix when
        merging up.
      a23276c5
    • Bjorn Munch's avatar
      Bug #12360501 MTR --GCOV DOES NOT WORK WITH CMAKE BUILDS · 404504bb
      Bjorn Munch authored
      Changed to use $bindir instead of $basedir
      Simplified search for files: find all *.gcno
      Also, .msg and .err files had been mixed up
      404504bb
    • Serge Kozlov's avatar
      autocommit 5.1 -> 5.5 · 2705490f
      Serge Kozlov authored
      2705490f
    • Serge Kozlov's avatar
      WL#5867, postfix for binlog_bug23533 · c65d5b76
      Serge Kozlov authored
      c65d5b76
    • Sergey Glukhov's avatar
      automerge · 8ded325f
      Sergey Glukhov authored
      8ded325f
    • Sergey Glukhov's avatar
      5.1 -> 5.5 merge · 625d0c6c
      Sergey Glukhov authored
      625d0c6c
    • Jon Olav Hauglid's avatar
      Bug#12352846 - TRANS_XA_START(THD*): · 889a52d5
      Jon Olav Hauglid authored
                     ASSERTION THD->TRANSACTION.XID_STATE.XID.IS_NULL()
                     FAILED
      
      The triggered assert checks that the previous XA transaction has
      done proper cleanup before a new XA transaction is started.
      The bug that caused it to be triggered was that XA COMMIT did not
      clean up error state if XA COMMIT discovered that the current XA
      transaction had to be rolled back.
      
      This patch fixes the problem by resetting the XA error state
      before XA COMMIT calls ha_rollback_trans(). This allows following
      XA transactions to be started without triggering the assert.
      
      Test case added to xa.test.
      889a52d5
    • Sergey Glukhov's avatar
      Bug#11756242 48137: PROCEDURE ANALYSE() LEAKS MEMORY WHEN RETURNING NULL · 3f3318c3
      Sergey Glukhov authored
      There are two problems with ANALYSE():
      
      1. Memory leak 
         it happens because do_select() can overwrite
         JOIN::procedure field(with zero value in our case) and
         JOIN destructor don't free the memory allocated for
         JOIN::procedure. The fix is to save original JOIN::procedure
         before do_select() call and restore it after do_select
         execution.
      
      2. Wrong result
         If ANALYSE() procedure is used for the statement with LIMIT clause
         it could retrun empty result set. It happens because of missing 
         analyse::end_of_records() call. First end_send() function call
         returns NESTED_LOOP_QUERY_LIMIT and second call of end_send() with
         end_of_records flag enabled does not happen. The fix is to return
         NESTED_LOOP_OK from end_send() if procedure is active.
      3f3318c3
    • Magne Mahre's avatar
      Bug#11766320 MYSQL SYMBOLIC LINKS NOT WORKING · da08d69b
      Magne Mahre authored
      When MySQL converted from autotools to CMake, the
      preprocessor symbol USE_SYMDIR was omitted by mistake.
      
      Without this symbol, the code for checking .sym files
      is not built.
      
      This patch defines USE_SYMDIR when built on MS Windows.
      da08d69b
  7. 13 Apr, 2011 2 commits