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 /sql/sql_servers.cc | |
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 'sql/sql_servers.cc')
0 files changed, 0 insertions, 0 deletions