diff options
| author | unknown <gluh@gluh.mysql.r18.ru> | 2005-03-17 16:51:07 +0300 |
|---|---|---|
| committer | unknown <gluh@gluh.mysql.r18.ru> | 2005-03-17 16:51:07 +0300 |
| commit | 17791f95002b2f9c8cb31eed64c36f019b2edda9 (patch) | |
| tree | 7107fca24e8d8dd39be0300a9e1e64d7ad8921a2 /heap | |
| parent | 621abfacfe316df9ce06c9d046ec11f23e543ea7 (diff) | |
| parent | 3e4ae65a144d8f7a63ee5f8c4d1ec65f94f35b58 (diff) | |
| download | mariadb-git-17791f95002b2f9c8cb31eed64c36f019b2edda9.tar.gz | |
Merge 4.1 -> 5.0
heap/hp_create.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/r/olap.result:
Auto merged
mysql-test/t/func_str.test:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/key.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_string.h:
Auto merged
client/mysqldump.c:
Manual merge
mysql-test/r/func_gconcat.result:
Manual merge
mysql-test/r/func_str.result:
Manual merge
mysql-test/t/func_gconcat.test:
Manual merge
sql/ha_heap.cc:
Manual merge
sql/sql_select.cc:
Manual merge
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 */ |