1. 27 Apr, 2011 3 commits
    • Magnus Blåudd's avatar
      BUG#47741 rpl_ndb_extraCol fails in next-mr (mysql-5.1-rep+2) in RBR · f73eb618
      Magnus Blåudd authored
       - fix the fix to properly detect when engine is NDB and
         also don't drop the table t9 if it hasn't been created
      f73eb618
    • Sergey Glukhov's avatar
      5.1 -> 5.5 merge · 197bef38
      Sergey Glukhov authored
      197bef38
    • Sergey Glukhov's avatar
      Bug#11889186 60503: CRASH IN MAKE_DATE_TIME WITH DATE_FORMAT / STR_TO_DATE COMBINATION · a60c39a2
      Sergey Glukhov authored
      calc_daynr() function returns negative result
      if malformed date with zero year and month is used.
      Attempt to calculate week day on negative value
      leads to crash. The fix is return NULL for
      'W', 'a', 'w' specifiers if zero year and month is used.
      Additional fix for calc_daynr():
      --added assertion that result can not be negative
      --return 0 if zero year and month is used
      
      
      mysql-test/r/func_time.result:
        test case
      mysql-test/t/func_time.test:
        test case
      sql-common/my_time.c:
        --added assertion that result can not be negative
        --return 0 if zero year and month is used
      sql/item_timefunc.cc:
        eturn NULL for 'W', 'a', 'w' specifiers
        if zero year and month is used.
      a60c39a2
  2. 26 Apr, 2011 8 commits
  3. 25 Apr, 2011 2 commits
  4. 23 Apr, 2011 3 commits
  5. 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
  6. 21 Apr, 2011 4 commits
  7. 20 Apr, 2011 10 commits
  8. 18 Apr, 2011 6 commits
  9. 16 Apr, 2011 1 commit