Additional key segment (HA_KEYTYPE_END) creation has been moved from handler to hp_create.c

BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

1 files changed, 0 insertions, 13 deletions

diff --git a/sql/ha_heap.cc b/sql/ha_heap.cc
index f56bfe74265..b41ab648f0b 100644
--- a/sql/ha_heap.cc
+++ b/sql/ha_heap.cc
@@ -243,11 +243,7 @@ int ha_heap::create(const char *name, TABLE *table, HA_CREATE_INFO *create_info)
   int error;
 
   for (key= parts= 0; key < table->keys; key++)
-  {
     parts+= table->key_info[key].key_parts;
-    if (table->key_info[key].algorithm == HA_KEY_ALG_BTREE)
-      parts++; /* additional HA_KEYTYPE_END keyseg */
-  }
 
   if (!(keydef= (HP_KEYDEF*) my_malloc(table->keys * sizeof(HP_KEYDEF) +
 				       parts * sizeof(HA_KEYSEG), MYF(MY_WME))))
@@ -299,15 +295,6 @@ int ha_heap::create(const char *name, TABLE *table, HA_CREATE_INFO *create_info)
 	seg->null_pos= 0;
       }
     }
-    if (pos->algorithm == HA_KEY_ALG_BTREE)
-    {
-      /* additional HA_KEYTYPE_END keyseg */
-      seg->type=     HA_KEYTYPE_END;
-      seg->length=   sizeof(byte*);
-      seg->flag=     0;
-      seg->null_bit= 0;
-      seg++;
-    }
   }
   mem_per_row+= MY_ALIGN(table->reclength + 1, sizeof(char*));
   max_rows= (ulong) (max_heap_table_size / mem_per_row);