diff options
Diffstat (limited to 'heap')
| -rw-r--r-- | heap/hp_info.c | 15 | ||||
| -rw-r--r-- | heap/hp_open.c | 3 |
2 files changed, 11 insertions, 7 deletions
diff --git a/heap/hp_info.c b/heap/hp_info.c index 3e9d6b6a90b..c8cdfc58c2d 100644 --- a/heap/hp_info.c +++ b/heap/hp_info.c @@ -48,12 +48,13 @@ int heap_info(reg1 HP_INFO *info,reg2 HEAPINFO *x, int flag __attribute__((unused))) { 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; DBUG_RETURN(0); } /* heap_info */ diff --git a/heap/hp_open.c b/heap/hp_open.c index ec8b5fea904..3bf2881667a 100644 --- a/heap/hp_open.c +++ b/heap/hp_open.c @@ -30,6 +30,7 @@ HP_INFO *heap_open(const char *name, int mode, uint keys, HP_KEYDEF *keydef, uint reclength, ulong max_records, ulong min_records) { uint i,j,key_segs,max_length,length; + my_bool implicit_emptied= 0; HP_INFO *info; HP_SHARE *share; HP_KEYSEG *keyseg; @@ -39,6 +40,7 @@ HP_INFO *heap_open(const char *name, int mode, uint keys, HP_KEYDEF *keydef, if (!(share=_hp_find_named_heap(name))) { DBUG_PRINT("info",("Initializing new table")); + implicit_emptied= 1; for (i=key_segs=max_length=0 ; i < keys ; i++) { key_segs+= keydef[i].keysegs; @@ -127,6 +129,7 @@ HP_INFO *heap_open(const char *name, int mode, uint keys, HP_KEYDEF *keydef, #ifndef DBUG_OFF info->opt_flag=READ_CHECK_USED; /* Check when changing */ #endif + info->implicit_emptied= implicit_emptied; DBUG_PRINT("exit",("heap: %lx reclength: %d records_in_block: %d", info,share->reclength,share->block.records_in_block)); DBUG_RETURN(info); |