summaryrefslogtreecommitdiff
path: root/heap
diff options
context:
space:
mode:
authormonty@mysql.com <>2004-02-16 10:03:25 +0200
committermonty@mysql.com <>2004-02-16 10:03:25 +0200
commitf43093ec0e1ca391f0cdde589418d19c4b82241a (patch)
tree44dc172194086edaeef7da9c9ed059171579a886 /heap
parentce145789092b294a562f565671478ae2bf51d14a (diff)
downloadmariadb-git-f43093ec0e1ca391f0cdde589418d19c4b82241a.tar.gz
After merge fixes
Added more DBUG statements Ensure that we are comparing end space with BINARY strings Use 'any_db' instead of '' to mean any database. (For HANDLER command) Only strip ' ' when comparing CHAR, not other space-like characters (like \t)
Diffstat (limited to 'heap')
-rw-r--r--heap/hp_info.c1
-rw-r--r--heap/hp_open.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/heap/hp_info.c b/heap/hp_info.c
index a403ff9bb45..2e56d030234 100644
--- a/heap/hp_info.c
+++ b/heap/hp_info.c
@@ -54,7 +54,6 @@ 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->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 497b3e4772d..1fa832208fb 100644
--- a/heap/hp_open.c
+++ b/heap/hp_open.c
@@ -63,7 +63,6 @@ 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);