From 4eebfd09c2b045258615bf07990deb6f0f73f729 Mon Sep 17 00:00:00 2001
From: "bar@mysql.com/bar.myoffice.izhnet.ru" <>
Date: Fri, 3 Aug 2007 15:25:23 +0500
Subject: Bug#28875 Conversion between ASCII and LATIN1 charsets does not
 function (Regression, caused by a patch for the bug 22646). Problem: when
 result type of date_format() was changed from binary string to character
 string, mixing date_format() with a ascii column in CONCAT() stopped to work.
 Fix: - adding "repertoire" flag into DTCollation class, to mark items which
 can return only pure ASCII strings. - allow character set conversion from
 pure ASCII to other character sets.

---
 mysys/charset.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'mysys')

diff --git a/mysys/charset.c b/mysys/charset.c
index 9ea17c6515c..4c3f2d0ab71 100644
--- a/mysys/charset.c
+++ b/mysys/charset.c
@@ -277,6 +277,9 @@ static int add_collation(CHARSET_INFO *cs)
         if (sort_order && sort_order['A'] < sort_order['a'] &&
                           sort_order['a'] < sort_order['B'])
           all_charsets[cs->number]->state|= MY_CS_CSSORT; 
+
+        if (my_charset_is_8bit_pure_ascii(all_charsets[cs->number]))
+          all_charsets[cs->number]->state|= MY_CS_PUREASCII;
       }
     }
     else
-- 
cgit v1.2.1