1. 20 Jul, 2010 7 commits
  2. 19 Jul, 2010 10 commits
    • Davi Arnaut's avatar
      Merge into mysql-trunk-merge.. · ce2403e6
      Davi Arnaut authored
      ce2403e6
    • Davi Arnaut's avatar
      Merge of mysql-5.1 into mysql-5.1-bugteam. · 13f856f5
      Davi Arnaut authored
      13f856f5
    • Evgeny Potemkin's avatar
      Bug#49771: Incorrect MIN/MAX for date/time values. · 589027b2
      Evgeny Potemkin authored
      This bug is a design flaw of the fix for the bug#33546. It assumed that an
      item can be used only in one comparison context, but actually it isn't the
      case. Item_cache_datetime is used to store result for MIX/MAX aggregate
      functions. Because Arg_comparator always compares datetime values as INTs when
      possible the Item_cache_datetime most time caches only INT value. But
      since all datetime values has STRING result type MIN/MAX functions are asked
      for a STRING value when the result is being sent to a client. The
      Item_cache_datetime was designed to avoid conversions and get INT/STRING
      values from an underlying item, but at the moment the values is asked
      underlying item doesn't hold it anymore thus wrong result is returned.
      Beside that MIN/MAX aggregate functions was wrongly initializing cached result
      and this led to a wrong result.
      
      The Item::has_compatible_context helper function is added. It checks whether
      this and given items has the same comparison context or can be compared as
      DATETIME values by Arg_comparator. The equality propagation optimization is
      adjusted to take into account that items which being compared as DATETIME
      can have different comparison contexts.
      The Item_cache_datetime now converts cached INT value to a correct STRING
      DATETIME value by means of number_to_datetime & my_TIME_to_str functions.
      The Arg_comparator::set_cmp_context_for_datetime helper function is added. 
      It sets comparison context of items being compared as DATETIMEs to INT if
      items will be compared as longlong.
      The Item_sum_hybrid::setup function now correctly initializes its result
      value.
      In order to avoid unnecessary conversions Item_sum_hybrid now states that it
      can provide correct longlong value if the item being aggregated can do it
      too.
      589027b2
    • Georgi Kodinov's avatar
      fix tree names · 32dcc26b
      Georgi Kodinov authored
      32dcc26b
    • MySQL Build Team's avatar
      5.1.49 push to mysql-5.1 · f0771195
      MySQL Build Team authored
      f0771195
    • Jonathan Perkin's avatar
      bug#55250: 5.5.5-m3 incorrectly compiled with exceptions on Solaris/x86 · 40856e83
      Jonathan Perkin authored
      Put '-features=no%except' back into Solaris/x86 CXXFLAGS.
      40856e83
    • Alexander Nozdrin's avatar
      Manual merge from mysql-trunk. · 9503a8e2
      Alexander Nozdrin authored
      Conflicts:
        - scripts/CMakeLists.txt
      9503a8e2
    • sunanda.menon@sun.com's avatar
      Merge from mysql-5.5.5-m3-release · 226852ea
      sunanda.menon@sun.com authored
      226852ea
    • Jon Olav Hauglid's avatar
      manual merge from mysql-5.1-bugteam · d4885416
      Jon Olav Hauglid authored
      d4885416
    • Jon Olav Hauglid's avatar
      Bug #54734 assert in Diagnostics_area::set_ok_status · 4b2378a1
      Jon Olav Hauglid authored
      This assert checks that the server does not try to send OK to the
      client if there has been some error during processing. This is done
      to make sure that the error is in fact sent to the client.
      
      The problem was that view errors during processing of WHERE conditions
      in UPDATE statements where not detected by the update code. It therefore
      tried to send OK to the client, triggering the assert.
      The bug was only noticeable in debug builds.
      
      This patch fixes the problem by making sure that the update code
      checks for errors during condition processing and acts accordingly.
      4b2378a1
  3. 17 Jul, 2010 2 commits
  4. 16 Jul, 2010 20 commits
  5. 15 Jul, 2010 1 commit