mirror of
https://github.com/MariaDB/server.git
synced 2026-05-06 15:15:34 +02:00
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:
parent
bf87279917
commit
b043f06666
5 changed files with 33 additions and 2 deletions
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue