diff options
| author | unknown <istruewing@chilla.local> | 2007-03-27 17:59:49 +0200 |
|---|---|---|
| committer | unknown <istruewing@chilla.local> | 2007-03-27 17:59:49 +0200 |
| commit | 548aad2578670f1ad9af2efa38f9a4d63f535810 (patch) | |
| tree | 488f8a4e87714bd4ea3abfe31971540c3ef4162e /storage/heap | |
| parent | fa82ebd2d650fe92119ac72169460b80da84e60f (diff) | |
| parent | 5e0ce03954693c5160feeebd475b048f8b6b2497 (diff) | |
| download | mariadb-git-548aad2578670f1ad9af2efa38f9a4d63f535810.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into chilla.local:/home/mydev/mysql-5.1-bug24985
storage/myisam/ha_myisam.cc:
Auto merged
mysql-test/r/heap_btree.result:
Bug#24985 - UTF8 ENUM primary key on MEMORY using BTREE
causes incorrect duplicate entries
Manual merge from 5.0
mysql-test/t/heap_btree.test:
Bug#24985 - UTF8 ENUM primary key on MEMORY using BTREE
causes incorrect duplicate entries
Manual merge from 5.0
Diffstat (limited to 'storage/heap')
| -rw-r--r-- | storage/heap/ha_heap.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/storage/heap/ha_heap.cc b/storage/heap/ha_heap.cc index f2caa7e6d18..02448eb3aa2 100644 --- a/storage/heap/ha_heap.cc +++ b/storage/heap/ha_heap.cc @@ -627,7 +627,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; |