diff options
| author | unknown <monty@mysql.com> | 2005-03-16 01:15:45 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-03-16 01:15:45 +0200 |
| commit | da911ec8f150102029708f0abd7d1718c475702b (patch) | |
| tree | 1c3a9f53159792621bebada164d840c322b55bf5 /heap | |
| parent | e656fba7788dcb42c2c74a6f5a575f28e284aa03 (diff) | |
| download | mariadb-git-da911ec8f150102029708f0abd7d1718c475702b.tar.gz | |
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:
Partly reverty back patch to ensure that auto_key and auto_key_type are calculated the same way
include/heap.h:
Partly reverty back patch to ensure that auto_key and auto_key_type are calculated the same way
mysql-test/mysql-test-run.sh:
made --skip-ndb a synonyme for --skip-ndbcluster
sql/ha_heap.cc:
Partly reverty back patch to ensure that auto_key and auto_key_type are calculated the same way
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 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 */ |