1. 07 Oct, 2010 2 commits
    • Evgeny Potemkin's avatar
      Auto-merged. · 28af216c
      Evgeny Potemkin authored
      28af216c
    • Evgeny Potemkin's avatar
      Bug#57039: constant subtime expression returns incorrect result. · 4bfec573
      Evgeny Potemkin authored
      The subtime function wasn't able to produce correct int representation of
      its result. For constant expressions the Item_datetime_cache is used to
      speedup evaluation and Item_datetime_cache expects underlying item to return
      correct int representation of DATETIME value. These two factors combined led
      to a wrong query result.
      
      Now the Item_func_add_time has function val_datetime which performs the
      calculation and saves result into given MYSQL_TIME struct, it also sets
      null_value to appropriate value. val_int and val_str member functions
      convert the result obtained from val_datetime to int or string respectively
      and returns it.
      4bfec573
  2. 06 Oct, 2010 4 commits
    • Alexander Nozdrin's avatar
      Fix for Bug#57094 (Copyright notice incorrect?). · f79f6e0c
      Alexander Nozdrin authored
      The fix is to:
        - introduce ORACLE_WELCOME_COPYRIGHT_NOTICE define to have a single place
          to specify copyright notice;
        - replace custom copyright notices with ORACLE_WELCOME_COPYRIGHT_NOTICE
          in programs.
      f79f6e0c
    • Alexander Barkov's avatar
      Bug#55744 GROUP_CONCAT + CASE + ucs return garbage · ab15833a
      Alexander Barkov authored
      Problem: CASE didn't work with a mixture of different character
      sets in THEN/ELSE in some cases.
      This happened because after character set aggregation
      newly created Item_func_conv_charset items corresponding
      to THEN/ELSE arguments were not put back to args[] array.
      
      Fix:
      put all Item_func_conv_charset back to args[].
      
      
        @ mysql-test/include/ctype_numconv.inc
        @ mysql-test/r/ctype_ucs.result
        Adding tests
      
        @ sql/item_cmpfunc.cc
        Put "agg" back to args[] after character set aggregation.
      ab15833a
    • Vladislav Vaintroub's avatar
      merge · 817f02fd
      Vladislav Vaintroub authored
      817f02fd
    • Luis Soares's avatar
      BUG#52202: mysqlbinlog_row* fail in daily-trunk on Sol10 · d09c19f7
      Luis Soares authored
                 x86_64 debug_max
            
      Removed test cases affected by this bug from experimental 
      list.
      d09c19f7
  3. 05 Oct, 2010 13 commits
  4. 04 Oct, 2010 21 commits