diff options
| author | unknown <serg@serg.mylan> | 2005-03-09 19:22:30 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-03-09 19:22:30 +0100 |
| commit | d1b3c64b230e35dccf33ac7bb70bdd52f779536b (patch) | |
| tree | f16bb48edb46705380ea8ac84c64b53a1a81b163 /sql/ha_heap.cc | |
| parent | cd4961830ef37a6c4470ec22fecdf308fc307a46 (diff) | |
| download | mariadb-git-d1b3c64b230e35dccf33ac7bb70bdd52f779536b.tar.gz | |
after merge fixes
mysql-test/r/fulltext.result:
after merge - test results updated
sql/sql_class.cc:
protection
Diffstat (limited to 'sql/ha_heap.cc')
| -rw-r--r-- | sql/ha_heap.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/ha_heap.cc b/sql/ha_heap.cc index b5884b17093..7dc7da4dad6 100644 --- a/sql/ha_heap.cc +++ b/sql/ha_heap.cc @@ -489,8 +489,6 @@ int ha_heap::create(const char *name, TABLE *table_arg, default: DBUG_ASSERT(0); // cannot happen } - keydef[key].algorithm= ((pos->algorithm == HA_KEY_ALG_UNDEF) ? - HA_KEY_ALG_HASH : pos->algorithm); for (; key_part != key_part_end; key_part++, seg++) { |