Changes 5.5.12:

* Fixed bugs: Illegal mix of collations
* Problem: comparison of a DATETIME sp variable and NOW() led to Illegal mix of
  collations error when character_set_connection=utf8.
* 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.

1 files changed, 2 insertions, 2 deletions

diff --git a/databases/mysql55-client/Makefile.common b/databases/mysql55-client/Makefile.common
index 2bf32ac5155..d7e542a2445 100644
--- a/databases/mysql55-client/Makefile.common
+++ b/databases/mysql55-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.3 2011/05/06 16:21:25 abs Exp $
+# $NetBSD: Makefile.common,v 1.4 2011/05/07 04:03:07 adam Exp $
 #
 # used by databases/mysql55-client/Makefile
 # used by databases/mysql55-server/Makefile
 
-DISTNAME=	mysql-5.5.11
+DISTNAME=	mysql-5.5.12
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=MySQL-5.5/}