1. 03 May, 2011 1 commit
  2. 28 Apr, 2011 1 commit
    • Tor Didriksen's avatar
      Bug#12340997 - DATE_ADD/DATE_SUB WITH INTERVAL CRASHES IN GET_INTERVAL_VALUE() · ae154449
      Tor Didriksen authored
      get_interval_value() was trying to parse the input string,
      looking for leading '-' while skipping whitespace.
      The macro my_isspace() does not work for utf16 character set,
      since my_charset_utf16_general_ci.ctype == NULL.
      
      Solution: convert input to ASCII before parsing.
      
      
      mysql-test/r/ctype_utf16.result:
        New test case.
      mysql-test/t/ctype_utf16.test:
        New test case.
      sql/item_timefunc.cc:
        Use val_string_ascii() rather than val_string()
        so that we can safely use my_isspace() for skipping whitespace.
      ae154449
  3. 27 Apr, 2011 1 commit
  4. 18 Apr, 2011 2 commits
  5. 15 Apr, 2011 2 commits
  6. 13 Apr, 2011 3 commits
  7. 11 Apr, 2011 23 commits
  8. 10 Apr, 2011 1 commit
  9. 08 Apr, 2011 6 commits
    • Alexander Nozdrin's avatar
      Auto-merge from mysql-5.5. · d5db1540
      Alexander Nozdrin authored
      d5db1540
    • Alexander Barkov's avatar
      Bug#11926811 / Bug#60625 Illegal mix of collations · a1c762b9
      Alexander Barkov authored
      Problem: comparison of a DATETIME sp variable and NOW()
      led to Illegal mix of collations error when 
      character_set_connection=utf8.
      Introduced by "WL#2649 Number-to-string conversions".
      
      Error happened in Arg_comparator::set_compare_func(),
      because the first argument was errouneously converted to utf8,
      while the second argument was not.
      
      Fix: separate agg_arg_charsets_for_comparison() into two functions:
      
      - agg_arg_charsets_for_comparison() - for pure comparison,
        when we don't need to return any string result and therefore
        don't need to convert arguments to @@character_set_connection:
          SELECT a = b;
      
      - agg_arg_charsets_for_string_results_with_comparison() - when
        we need to return a string result, but we also need to do
        comparison internally: SELECT REPLACE(a,b,c)
        If all arguments are numbers:
          SELECT REPLACE(123,2,3) -> 133
        we convert arguments to @@character_set_connection.
      
      
        @ mysql-test/include/ctype_numconv.inc
        @ mysql-test/r/ctype_binary.result
        @ mysql-test/r/ctype_cp1251.result
        @ mysql-test/r/ctype_latin1.result
        @ mysql-test/r/ctype_ucs.result
        @ mysql-test/r/ctype_utf8.result
        Adding tests
      
        @ sql/item.cc
        @ sql/item.h
        @ sql/item_func.cc
        @ sql/item_func.h
        @ sql/item_strfunc.cc
      
        Introducing and using new function
         agg_item_charsets_for_string_result_with_comparison() and
        its Item_func wrapper agg_arg_charsets_for_string_result_with_comparison().
      a1c762b9
    • Alexander Nozdrin's avatar
      Empty merge from mysql-5.1-security. · b49959f5
      Alexander Nozdrin authored
      b49959f5
    • Alexander Nozdrin's avatar
      Auto-merge from mysql-5.5. · 4c98800a
      Alexander Nozdrin authored
      4c98800a
    • Alexander Nozdrin's avatar
      Auto-merge from mysql-5.1. · b75d77cb
      Alexander Nozdrin authored
      b75d77cb
    • Alexander Nozdrin's avatar
      A patch for Bug#12325375: THE SERVER ON WINXP DOES NOT ALLOW CONNECTIONS · 31e7450c
      Alexander Nozdrin authored
      IF NO DNS-SERVER AVAILABLE.
      
      The thing is that on Windows XP getnameinfo() returns WSANO_DATA
      when hostname-lookup is not available. The problem was that
      this error code was treated as serious error and the client
      connection got rejected.
      
      The fix is to treat all errors from getnameinfo() as not ciritical,
      but add IP-address to the host cache only for EAI_NONAME (or WSANO_DATA).
      31e7450c