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, 12 insertions, 3 deletions

diff --git a/databases/mysql55-server/PLIST b/databases/mysql55-server/PLIST
index a65c1868242..2d22fa15c26 100644
--- a/databases/mysql55-server/PLIST
+++ b/databases/mysql55-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2011/05/06 16:21:16 abs Exp $
+@comment $NetBSD: PLIST,v 1.3 2011/05/07 04:03:08 adam Exp $
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
@@ -476,6 +476,7 @@ share/mysql/test/include/no_valgrind_without_big.inc
 share/mysql/test/include/not_as_root.inc
 share/mysql/test/include/not_binlog_format_row.inc
 share/mysql/test/include/not_blackhole.inc
+share/mysql/test/include/not_crashrep.inc
 share/mysql/test/include/not_embedded.inc
 share/mysql/test/include/not_ndb.inc
 share/mysql/test/include/not_ndb_default.inc
@@ -1091,8 +1092,8 @@ share/mysql/test/r/partition_list.result
 share/mysql/test/r/partition_mgm.result
 share/mysql/test/r/partition_mgm_err.result
 share/mysql/test/r/partition_mgm_err2.result
+share/mysql/test/r/partition_myisam.result
 share/mysql/test/r/partition_not_blackhole.result
-share/mysql/test/r/partition_not_embedded.result
 share/mysql/test/r/partition_not_windows.result
 share/mysql/test/r/partition_open_files_limit.result
 share/mysql/test/r/partition_order.result
@@ -1226,6 +1227,7 @@ share/mysql/test/r/sysdate_is_now.result
 share/mysql/test/r/system_mysql_db.result
 share/mysql/test/r/system_mysql_db_refs.result
 share/mysql/test/r/tablelock.result
+share/mysql/test/r/tablespace.result
 share/mysql/test/r/temp_table.result
 share/mysql/test/r/testdb_only.require
 share/mysql/test/r/timezone.result
@@ -1324,6 +1326,9 @@ share/mysql/test/std_data/charset_utf8.txt
 share/mysql/test/std_data/checkDBI_DBD-mysql.pl
 share/mysql/test/std_data/client-cert.pem
 share/mysql/test/std_data/client-key.pem
+share/mysql/test/std_data/cluster_7022_table.MYD
+share/mysql/test/std_data/cluster_7022_table.MYI
+share/mysql/test/std_data/cluster_7022_table.frm
 share/mysql/test/std_data/corrupt-relay-bin.000624
 share/mysql/test/std_data/corrupt_t1#P#p1.MYI
 share/mysql/test/std_data/corrupt_t1.MYI
@@ -2947,6 +2952,7 @@ share/mysql/test/suite/innodb/r/innodb_bug57255.result
 share/mysql/test/suite/innodb/r/innodb_bug57904.result
 share/mysql/test/suite/innodb/r/innodb_bug59307.result
 share/mysql/test/suite/innodb/r/innodb_bug60049.result
+share/mysql/test/suite/innodb/r/innodb_bug60196.result
 share/mysql/test/suite/innodb/r/innodb_file_format.result
 share/mysql/test/suite/innodb/r/innodb_gis.result
 share/mysql/test/suite/innodb/r/innodb_information_schema.result
@@ -3041,6 +3047,8 @@ share/mysql/test/suite/innodb/t/innodb_bug57904.test
 share/mysql/test/suite/innodb/t/innodb_bug59307.test
 share/mysql/test/suite/innodb/t/innodb_bug60049-master.opt
 share/mysql/test/suite/innodb/t/innodb_bug60049.test
+share/mysql/test/suite/innodb/t/innodb_bug60196-master.opt
+share/mysql/test/suite/innodb/t/innodb_bug60196.test
 share/mysql/test/suite/innodb/t/innodb_file_format.test
 share/mysql/test/suite/innodb/t/innodb_gis.test
 share/mysql/test/suite/innodb/t/innodb_information_schema.test
@@ -5900,9 +5908,9 @@ share/mysql/test/t/partition_list.test
 share/mysql/test/t/partition_mgm.test
 share/mysql/test/t/partition_mgm_err.test
 share/mysql/test/t/partition_mgm_err2.test
+share/mysql/test/t/partition_myisam.test
 share/mysql/test/t/partition_not_blackhole-master.opt
 share/mysql/test/t/partition_not_blackhole.test
-share/mysql/test/t/partition_not_embedded.test
 share/mysql/test/t/partition_not_windows-master.opt
 share/mysql/test/t/partition_not_windows.test
 share/mysql/test/t/partition_open_files_limit-master.opt
@@ -6060,6 +6068,7 @@ share/mysql/test/t/system_mysql_db_fix50117-master.opt
 share/mysql/test/t/system_mysql_db_fix50117.test
 share/mysql/test/t/system_mysql_db_refs.test
 share/mysql/test/t/tablelock.test
+share/mysql/test/t/tablespace.test
 share/mysql/test/t/temp_table-master.opt
 share/mysql/test/t/temp_table.test
 share/mysql/test/t/timezone-master.opt