diff options
author | Ashish Agarwal <ashish.y.agarwal@oracle.com> | 2011-09-27 17:44:31 +0530 |
---|---|---|
committer | Ashish Agarwal <ashish.y.agarwal@oracle.com> | 2011-09-27 17:44:31 +0530 |
commit | 236886d754b039610c2e500e53e417e464e8faaa (patch) | |
tree | f5bd691382ef6bdba1495329896320f0c9c56c38 /storage/heap | |
parent | 9cc04425278c6aa9ba7930ce1eb907e47d35a399 (diff) | |
parent | 5dbcff9b9c86dc9608252d270b6ebff7a6066040 (diff) | |
download | mariadb-git-236886d754b039610c2e500e53e417e464e8faaa.tar.gz |
Bug#11759349 -- Merge of patch from mysql-5.1.
Diffstat (limited to 'storage/heap')
-rw-r--r-- | storage/heap/ha_heap.cc | 1 | ||||
-rw-r--r-- | storage/heap/hp_create.c | 1 | ||||
-rw-r--r-- | storage/heap/hp_info.c | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/storage/heap/ha_heap.cc b/storage/heap/ha_heap.cc index a53b588ab69..b704d42cbf4 100644 --- a/storage/heap/ha_heap.cc +++ b/storage/heap/ha_heap.cc @@ -416,6 +416,7 @@ int ha_heap::info(uint flag) stats.index_file_length= hp_info.index_length; stats.max_data_file_length= hp_info.max_records * hp_info.reclength; stats.delete_length= hp_info.deleted * hp_info.reclength; + stats.create_time= (ulong) hp_info.create_time; if (flag & HA_STATUS_AUTO) stats.auto_increment_value= hp_info.auto_increment; /* diff --git a/storage/heap/hp_create.c b/storage/heap/hp_create.c index a55b839ad0d..808a6f268c9 100644 --- a/storage/heap/hp_create.c +++ b/storage/heap/hp_create.c @@ -186,6 +186,7 @@ int heap_create(const char *name, HP_CREATE_INFO *create_info, share->auto_key= create_info->auto_key; share->auto_key_type= create_info->auto_key_type; share->auto_increment= create_info->auto_increment; + share->create_time= (long) time((time_t*) 0); /* Must be allocated separately for rename to work */ if (!(share->name= my_strdup(name,MYF(0)))) { diff --git a/storage/heap/hp_info.c b/storage/heap/hp_info.c index ea78c53fd40..c72dbaf2065 100644 --- a/storage/heap/hp_info.c +++ b/storage/heap/hp_info.c @@ -53,6 +53,7 @@ int heap_info(reg1 HP_INFO *info,reg2 HEAPINFO *x, int flag ) x->index_length = info->s->index_length; x->max_records = info->s->max_records; x->errkey = info->errkey; + x->create_time = info->s->create_time; if (flag & HA_STATUS_AUTO) x->auto_increment= info->s->auto_increment + 1; DBUG_RETURN(0); |