diff options
| author | unknown <ramil@mysql.com> | 2005-03-15 19:31:52 +0400 |
|---|---|---|
| committer | unknown <ramil@mysql.com> | 2005-03-15 19:31:52 +0400 |
| commit | 3c42daa9a371e7900f10d2bfb2cf20e46cfba122 (patch) | |
| tree | 38d287295dc7d362de78330407519219d297132a /heap | |
| parent | 9af776c8cbad88bf4d42686c91a6aa8a67484d56 (diff) | |
| parent | 0ba3164e0e0fa7217059413440f7ab2f844efce7 (diff) | |
| download | mariadb-git-3c42daa9a371e7900f10d2bfb2cf20e46cfba122.tar.gz | |
merging
heap/hp_create.c:
Auto merged
sql/filesort.cc:
Auto merged
mysql-test/r/heap.result:
manual merging
mysql-test/t/heap.test:
manual merging
sql/ha_heap.cc:
manual merging
Diffstat (limited to 'heap')
| -rw-r--r-- | heap/hp_create.c | 3 |
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 */ |