Now several character sets can live in the same table,

However some hacks were used while waiting for new FRM file


sql/field.h:
  Added function to set Field charset
sql/filesort.cc:
  Temporarily workaround, It seems charset should be passed in argument
sql/ha_heap.cc:
  Set correct key charset from Field information
sql/table.cc:
  Dirty hack to distinguish columns charsets while waiting for Monty to rewrite FRM file
sql/table.h:
  New field: table default character set
This commit is contained in:
unknown 2002-05-14 20:58:38 +05:00
commit b043f06666
5 changed files with 33 additions and 2 deletions

View file

@ -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;