diff options
| author | unknown <istruewing@chilla.local> | 2007-03-28 16:57:08 +0200 |
|---|---|---|
| committer | unknown <istruewing@chilla.local> | 2007-03-28 16:57:08 +0200 |
| commit | ac7020f7f1c8d5734e715dda4221499beda59f36 (patch) | |
| tree | c2b36b7f679b07fb2f46dabe5c0301204531c5b8 /storage/heap | |
| parent | 310a940de911574eec32a33b27e0d9414ae4eb75 (diff) | |
| parent | 8d37f95b2150aa071f69abe0ff03ad2883970168 (diff) | |
| download | mariadb-git-ac7020f7f1c8d5734e715dda4221499beda59f36.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into chilla.local:/home/mydev/mysql-5.1-axmrg
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_servers.h:
Auto merged
storage/federated/ha_federated.cc:
Auto merged
storage/heap/ha_heap.cc:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
sql/sql_servers.cc:
Manual merge
Diffstat (limited to 'storage/heap')
| -rw-r--r-- | storage/heap/ha_heap.cc | 5 | ||||
| -rw-r--r-- | storage/heap/hp_write.c | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/storage/heap/ha_heap.cc b/storage/heap/ha_heap.cc index 5831ec6167a..8c378f7334f 100644 --- a/storage/heap/ha_heap.cc +++ b/storage/heap/ha_heap.cc @@ -628,7 +628,10 @@ int ha_heap::create(const char *name, TABLE *table_arg, seg->length= (uint) key_part->length; seg->flag= key_part->key_part_flag; - seg->charset= field->charset(); + if (field->flags & (ENUM_FLAG | SET_FLAG)) + seg->charset= &my_charset_bin; + else + seg->charset= field->charset(); if (field->null_ptr) { seg->null_bit= field->null_bit; diff --git a/storage/heap/hp_write.c b/storage/heap/hp_write.c index 86e79c9d7ec..19215fcf017 100644 --- a/storage/heap/hp_write.c +++ b/storage/heap/hp_write.c @@ -105,7 +105,6 @@ int hp_rb_write_key(HP_INFO *info, HP_KEYDEF *keyinfo, const byte *record, heap_rb_param custom_arg; uint old_allocated; - info->last_pos= NULL; /* For heap_rnext/heap_rprev */ custom_arg.keyseg= keyinfo->seg; custom_arg.key_length= hp_rb_make_key(keyinfo, info->recbuf, record, recpos); if (keyinfo->flag & HA_NOSAME) |