diff options
| author | gluh@gluh.mysql.r18.ru <> | 2005-03-17 16:51:07 +0300 |
|---|---|---|
| committer | gluh@gluh.mysql.r18.ru <> | 2005-03-17 16:51:07 +0300 |
| commit | b435d6e8624800e63f7b1b3e49f181c186db7c21 (patch) | |
| tree | 7107fca24e8d8dd39be0300a9e1e64d7ad8921a2 /heap | |
| parent | 08b2c7ecca7ba3fd3d55267bcf4ce900fa9ce595 (diff) | |
| parent | 261105a0077dff19d0f6e38dc3a225ad19ba4a1b (diff) | |
| download | mariadb-git-b435d6e8624800e63f7b1b3e49f181c186db7c21.tar.gz | |
Merge 4.1 -> 5.0
Diffstat (limited to 'heap')
| -rw-r--r-- | heap/hp_create.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/heap/hp_create.c b/heap/hp_create.c index 55b8e1e2a33..17aa92c9201 100644 --- a/heap/hp_create.c +++ b/heap/hp_create.c @@ -168,8 +168,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; @@ -180,6 +178,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 */ |