diff options
| author | monty@mysql.com <> | 2004-12-06 19:18:35 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-12-06 19:18:35 +0200 |
| commit | 77207d19f20f21c54b8d5279c6924f4c4bdaaa51 (patch) | |
| tree | 44698f6f68c51daacf7552356ae071b8e8fdb035 /sql/ha_heap.cc | |
| parent | e99d5fee828e40589d7a29b81bba32b53e94037a (diff) | |
| parent | 67ce24796584e80cf843b37b09aeb794c9231190 (diff) | |
| download | mariadb-git-77207d19f20f21c54b8d5279c6924f4c4bdaaa51.tar.gz | |
Merge with new VARCHAR code
Diffstat (limited to 'sql/ha_heap.cc')
| -rw-r--r-- | sql/ha_heap.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/ha_heap.cc b/sql/ha_heap.cc index 46824033db9..29508207a70 100644 --- a/sql/ha_heap.cc +++ b/sql/ha_heap.cc @@ -481,16 +481,20 @@ int ha_heap::create(const char *name, TABLE *table_arg, { uint flag= key_part->key_type; Field *field= key_part->field; + if (pos->algorithm == HA_KEY_ALG_BTREE) seg->type= field->key_type(); else { - if ((seg->type = field->key_type()) != (int) HA_KEYTYPE_TEXT) + if ((seg->type = field->key_type()) != (int) HA_KEYTYPE_TEXT && + seg->type != HA_KEYTYPE_VARTEXT && + seg->type != HA_KEYTYPE_VARBINARY) seg->type= HA_KEYTYPE_BINARY; } seg->start= (uint) key_part->offset; seg->length= (uint) key_part->length; - seg->flag = 0; + seg->flag= key_part->key_part_flag; + seg->charset= field->charset(); if (field->null_ptr) { |