1. 25 Apr, 2011 2 commits
  2. 23 Apr, 2011 3 commits
  3. 22 Apr, 2011 3 commits
    • Sergey Glukhov's avatar
      5.1 -> 5.5 merge · 19301684
      Sergey Glukhov authored
      19301684
    • Sergey Glukhov's avatar
      Bug#11756928 48916: SERVER INCORRECTLY PROCESSING HAVING CLAUSES WITH AN ORDER BY CLAUSE · a5e8d902
      Sergey Glukhov authored
      Before sorting HAVING condition is split into two parts,
      first part is a table related condition and the rest of is
      HAVING part. Extraction of HAVING part does not take into account
      the fact that some of conditions might be non-const but
      have 'used_tables' == 0 (independent subqueries)
      and because of that these conditions are cut off by
      make_cond_for_table() function.
      The fix is to use (table_map) 0 instead of used_tables in
      third argument for make_cond_for_table() function.
      It allows to extract elements which belong to sorted
      table and in addition elements which are independend
      subqueries.
      
      
      mysql-test/r/having.result:
        test case
      mysql-test/t/having.test:
        test case
      sql/sql_select.cc:
        The fix is to use (table_map) 0 instead of used_tables in
        third argument for make_cond_for_table() function.
        It allows to extract elements which belong to sorted
        table and in addition elements which are independend
        subqueries.
      a5e8d902
    • Sergey Vojtovich's avatar
      Merge. · 923db5a2
      Sergey Vojtovich authored
      923db5a2
  4. 21 Apr, 2011 4 commits
  5. 20 Apr, 2011 10 commits
  6. 18 Apr, 2011 6 commits
  7. 16 Apr, 2011 3 commits
  8. 15 Apr, 2011 9 commits
    • Bjorn Munch's avatar
      null upmerge · bb77d4e0
      Bjorn Munch authored
      bb77d4e0
    • Bjorn Munch's avatar
      merge from 5.5 main · 8bd972e5
      Bjorn Munch authored
      8bd972e5
    • Bjorn Munch's avatar
      merge from 5.1 main · 0c362694
      Bjorn Munch authored
      0c362694
    • Alexander Nozdrin's avatar
      A patch for Bug#11763166 (55847: SHOW WARNINGS returns empty · 060541c0
      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).
      060541c0
    • Sergey Glukhov's avatar
      5.1 -> 5.5 merge · 98d52459
      Sergey Glukhov authored
      98d52459
    • Sergey Glukhov's avatar
      Bug#11765139 58069: LOAD DATA INFILE: VALGRIND REPORTS INVALID MEMORY READS AND WRITES WITH U · bba7b9ca
      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.
      
      
      mysql-test/r/loaddata.result:
        test case
      mysql-test/t/loaddata.test:
        test case
      sql/sql_load.cc:
        allocate stack buffer in compliance with max character length.
      bba7b9ca
    • Bjorn Munch's avatar
      upmerge 12351213,12360195 · 34a312a7
      Bjorn Munch authored
      34a312a7
    • Bjorn Munch's avatar
      Bug #12360195 MTR DOES NOT IGNORE TABS IN EXPERIMENTAL FILE · c95227ca
      Bjorn Munch authored
      Instead of just filtering space, filter white space (\s)
      I left the default.experimental file as is, with tabs.
      c95227ca
    • Tor Didriksen's avatar
      Merge fix for Bug#11765713 from 5.1 · 9cd03942
      Tor Didriksen authored
      9cd03942