diff options
| author | monty@mysql.com <> | 2004-02-11 00:06:46 +0100 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-02-11 00:06:46 +0100 |
| commit | ce145789092b294a562f565671478ae2bf51d14a (patch) | |
| tree | 927515d304bd661aebdb0e534418caf49d322ada /heap | |
| parent | 0c6a0b9a3118948efeedefd036d2994982babd08 (diff) | |
| parent | efb134f3a874befe4ab1779f597ada09f57ca191 (diff) | |
| download | mariadb-git-ce145789092b294a562f565671478ae2bf51d14a.tar.gz | |
Merge with 4.0.18
Diffstat (limited to 'heap')
| -rw-r--r-- | heap/hp_info.c | 15 | ||||
| -rw-r--r-- | heap/hp_open.c | 1 |
2 files changed, 9 insertions, 7 deletions
diff --git a/heap/hp_info.c b/heap/hp_info.c index e10d140e1f6..a403ff9bb45 100644 --- a/heap/hp_info.c +++ b/heap/hp_info.c @@ -47,13 +47,14 @@ ulong heap_position_old(HP_INFO *info) int heap_info(reg1 HP_INFO *info,reg2 HEAPINFO *x, int flag ) { DBUG_ENTER("heap_info"); - x->records = info->s->records; - x->deleted = info->s->deleted; - x->reclength = info->s->reclength; - x->data_length = info->s->data_length; - x->index_length= info->s->index_length; - x->max_records = info->s->max_records; - x->errkey = info->errkey; + x->records = info->s->records; + x->deleted = info->s->deleted; + x->reclength = info->s->reclength; + x->data_length = info->s->data_length; + x->index_length = info->s->index_length; + x->max_records = info->s->max_records; + x->errkey = info->errkey; + x->implicit_emptied= info->implicit_emptied; if (flag & HA_STATUS_AUTO) x->auto_increment= info->s->auto_increment + 1; DBUG_RETURN(0); diff --git a/heap/hp_open.c b/heap/hp_open.c index 1fa832208fb..497b3e4772d 100644 --- a/heap/hp_open.c +++ b/heap/hp_open.c @@ -63,6 +63,7 @@ HP_INFO *heap_open(const char *name, int mode) #ifndef DBUG_OFF info->opt_flag= READ_CHECK_USED; /* Check when changing */ #endif + info->implicit_emptied= 0; DBUG_PRINT("exit",("heap: %lx reclength: %d records_in_block: %d", info,share->reclength,share->block.records_in_block)); DBUG_RETURN(info); |