From fde941e5b4324925cceb3b628d2415e4baa38b37 Mon Sep 17 00:00:00 2001
From: "monty@mysql.com" <>
Date: Wed, 16 Mar 2005 01:15:45 +0200
Subject: Partly reverty back patch (in heap-auto-increment-key detection) to
 ensure that auto_key and auto_key_type are calculated the same way

---
 heap/hp_create.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'heap/hp_create.c')

diff --git a/heap/hp_create.c b/heap/hp_create.c
index b1b132a16fb..af32fefea1b 100644
--- a/heap/hp_create.c
+++ b/heap/hp_create.c
@@ -137,8 +137,6 @@ int heap_create(const char *name, uint keys, HP_KEYDEF *keydef,
 	keyinfo->write_key= hp_write_key;
         keyinfo->hash_buckets= 0;
       }
-      if ((keyinfo->flag & HA_AUTO_KEY) && create_info->with_auto_increment)
-        share->auto_key= i + 1;
     }
     share->min_records= min_records;
     share->max_records= max_records;
@@ -149,6 +147,7 @@ int heap_create(const char *name, uint keys, HP_KEYDEF *keydef,
     share->keys= keys;
     share->max_key_length= max_length;
     share->changed= 0;
+    share->auto_key= create_info->auto_key;
     share->auto_key_type= create_info->auto_key_type;
     share->auto_increment= create_info->auto_increment;
     /* Must be allocated separately for rename to work */
-- 
cgit v1.2.1