summaryrefslogtreecommitdiff
path: root/heap
diff options
context:
space:
mode:
authorramil@mysql.com <>2005-03-15 19:31:52 +0400
committerramil@mysql.com <>2005-03-15 19:31:52 +0400
commitd5e3ba70f34bcffc4493889f3ffd198832fff7b9 (patch)
tree38d287295dc7d362de78330407519219d297132a /heap
parent021f8d217052d791111a9c8e639f485f3f213e6b (diff)
parent04328c3dfa5de82abe7095d61d361d1c08b94a6f (diff)
downloadmariadb-git-d5e3ba70f34bcffc4493889f3ffd198832fff7b9.tar.gz
merging
Diffstat (limited to 'heap')
-rw-r--r--heap/hp_create.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/heap/hp_create.c b/heap/hp_create.c
index 17aa92c9201..55b8e1e2a33 100644
--- a/heap/hp_create.c
+++ b/heap/hp_create.c
@@ -168,6 +168,8 @@ 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;
@@ -178,7 +180,6 @@ 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 */