1. 12 Nov, 2009 3 commits
  2. 11 Nov, 2009 2 commits
  3. 10 Nov, 2009 3 commits
  4. 09 Nov, 2009 8 commits
    • Alexander Nozdrin's avatar
      Fix manual-merge (2nd attempt). · 49bb8cba
      Alexander Nozdrin authored
      49bb8cba
    • Alexander Nozdrin's avatar
      Auto-merge from mysql-trunk-merge. · a15de184
      Alexander Nozdrin authored
      a15de184
    • Alexander Nozdrin's avatar
      Fix manual-merge. · 831c8434
      Alexander Nozdrin authored
      831c8434
    • Alexander Nozdrin's avatar
      Fix innodb.test due to Bug#48636. · fae99a38
      Alexander Nozdrin authored
      fae99a38
    • Alexander Barkov's avatar
      725f93fa
    • Alexander Barkov's avatar
      # · f3d89b2a
      Alexander Barkov authored
      # Bug#24690 Stored functions: RETURNing UTF8 strings
      # do not return UTF8_UNICODE_CI collation
      #
      # Bug#17903: cast to char results in binary
      # Regression. The character set was not being properly initialized
      # for CAST() with a type like CHAR(2) BINARY, which resulted in
      # incorrect results or even a server crash.
      #
      
      Backporting from mysql-6.0-codebase.
      
      mysql-test/r/sp-ucs2.result:
      mysql-test/t/sp-ucs2.test:
      
        Adding tests
      
      sql/mysql_priv.h:
        Adding prototype
      
      sql/sp.cc
        Remember COLLATE clause for non-default collations
      
      sql/sql_parse.cc
        Adding a new helper function
      
      sql/sql_yacc.yy
        - Allow "CHARACTER SET cs COLLATE cl" in
          SP parameters, RETURNS, DECLARE
        - Minor reorganization for "ASCII" and "UNICODE"
          related rules, to make the code more readable,
          also to allow these aliases:
          * "VARCHAR(10) ASCII BINARY"   -> CHARACTER SET latin1 COLLATE latin1_bin
          * "VARCHAR(10) BINARY ASCII"   -> CHARACTER SET latin1 COLLATE latin1_bin
          * "VARCHAR(10) UNICODE BINARY" -> CHARACTER SET ucs2 COLLATE ucs2_bin
          * "VARCHAR(10) BINARY UNICODE" -> CHARACTER SET ucs2 COLLATE ucs2_bin
          Previously these four aliases returned the error
          "This version of MySQL does not yet support return value collation".
      
      Note:
      
         This patch allows  "VARCHAR(10) CHARACTER SET cs COLLATE cl"
         and the above four aliases.
      
         "VARCHAR(10) COLLATE cl" is still not allowed
         i.e. when COLLATE is given without CHARACTER SET.
         If we want to support this, we need an architecture decision
         which character set to use by default.
      f3d89b2a
    • Alexander Barkov's avatar
    • Alexander Barkov's avatar
      7e8b208d
  5. 06 Nov, 2009 14 commits
  6. 05 Nov, 2009 10 commits