diff options
author | adam <adam@pkgsrc.org> | 2011-05-07 04:03:07 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2011-05-07 04:03:07 +0000 |
commit | 44b9ba74de317ca90ac3ee0553da05189ba8f84b (patch) | |
tree | dc51a4224630cb42250a2e6a25e0ea87fd8d1cdb /databases/mysql55-client/patches | |
parent | c48f48db01215707bb835da2b66a6211b4ae73b8 (diff) | |
download | pkgsrc-44b9ba74de317ca90ac3ee0553da05189ba8f84b.tar.gz |
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.
Diffstat (limited to 'databases/mysql55-client/patches')
-rw-r--r-- | databases/mysql55-client/patches/patch-include_my_compare.h (renamed from databases/mysql55-client/patches/patch-include_my_handler.h) | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/databases/mysql55-client/patches/patch-include_my_handler.h b/databases/mysql55-client/patches/patch-include_my_compare.h index 3830d1912d5..24c65638a81 100644 --- a/databases/mysql55-client/patches/patch-include_my_handler.h +++ b/databases/mysql55-client/patches/patch-include_my_compare.h @@ -1,10 +1,10 @@ -$NetBSD: patch-include_my_handler.h,v 1.1.1.1 2011/04/25 21:12:53 adam Exp $ +$NetBSD: patch-include_my_compare.h,v 1.1 2011/05/07 04:03:08 adam Exp $ Adjust HA_MAX_KEY_LENGTH x4. ---- include/my_handler.h.orig 2010-02-04 11:37:06.000000000 +0000 -+++ include/my_handler.h -@@ -41,7 +41,7 @@ extern "C" { +--- include/my_compare.h.orig 2010-02-04 11:37:06.000000000 +0000 ++++ include/my_compare.h +@@ -39,7 +39,7 @@ extern "C" { But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH. */ |