1. 28 Apr, 2011 1 commit
  2. 27 Apr, 2011 1 commit
  3. 18 Apr, 2011 2 commits
  4. 15 Apr, 2011 2 commits
  5. 13 Apr, 2011 3 commits
  6. 11 Apr, 2011 23 commits
  7. 10 Apr, 2011 1 commit
  8. 08 Apr, 2011 7 commits
    • Alexander Nozdrin's avatar
      Auto-merge from mysql-5.5. · d7835481
      Alexander Nozdrin authored
      d7835481
    • Alexander Barkov's avatar
      Bug#11926811 / Bug#60625 Illegal mix of collations · ece1996b
      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().
      ece1996b
    • Alexander Nozdrin's avatar
      Empty merge from mysql-5.1-security. · 4025caf6
      Alexander Nozdrin authored
      4025caf6
    • Alexander Nozdrin's avatar
      Auto-merge from mysql-5.5. · eaa342db
      Alexander Nozdrin authored
      eaa342db
    • Alexander Nozdrin's avatar
      Auto-merge from mysql-5.1. · 397df0ec
      Alexander Nozdrin authored
      397df0ec
    • Alexander Nozdrin's avatar
      A patch for Bug#12325375: THE SERVER ON WINXP DOES NOT ALLOW CONNECTIONS · 6a293922
      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).
      6a293922
    • Gleb Shchepa's avatar
      manual merge 5.1-->5.5 (bug 11829681) · 71ffbd46
      Gleb Shchepa authored
      71ffbd46