Now several character sets can live in the same table,

However some hacks were used while waiting for new FRM file

1 files changed, 1 insertions, 1 deletions

diff --git a/sql/ha_heap.cc b/sql/ha_heap.cc
index 43485a97fe3..e18bc877540 100644
--- a/sql/ha_heap.cc
+++ b/sql/ha_heap.cc
@@ -85,7 +85,7 @@ int ha_heap::open(const char *name, int mode, uint test_if_locked)
       seg->start=   (uint) key_part->offset;
       seg->length=  (uint) key_part->length;
       seg->flag =   0;
-      seg->charset= default_charset_info;
+      seg->charset= field->binary() ? NULL : ((Field_str*)field)->charset();
       if (field->null_ptr)
       {
 	seg->null_bit= field->null_bit;