diff options
| author | unknown <bar@gw.udmsearch.izhnet.ru> | 2002-05-14 20:58:38 +0500 |
|---|---|---|
| committer | unknown <bar@gw.udmsearch.izhnet.ru> | 2002-05-14 20:58:38 +0500 |
| commit | b043f06666c278a4277e7d35b1bff418d45708c2 (patch) | |
| tree | aabc829c5778332b2dedc76303a4d72e9f3ea6f6 /sql/ha_heap.cc | |
| parent | bf8727991777e9fd90a5a6966454f942b162b502 (diff) | |
| download | mariadb-git-b043f06666c278a4277e7d35b1bff418d45708c2.tar.gz | |
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
Diffstat (limited to 'sql/ha_heap.cc')
| -rw-r--r-- | sql/ha_heap.cc | 2 |
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; |