summaryrefslogtreecommitdiff
path: root/storage/heap/hp_create.c
diff options
context:
space:
mode:
authorunknown <svoj@april.(none)>2006-05-18 18:49:52 +0500
committerunknown <svoj@april.(none)>2006-05-18 18:49:52 +0500
commit481ba7789b6b3113c34585af84310d01a8c75d1a (patch)
treedf1b5eb8db09ae65ea711dc3271e2de8e3be3720 /storage/heap/hp_create.c
parent7937b3e6a282b5b18a7891e70e8cb8b42b9b0463 (diff)
parent0086d5abd9d59dc984d402e07a6df6f9c447f098 (diff)
downloadmariadb-git-481ba7789b6b3113c34585af84310d01a8c75d1a.tar.gz
Merge april.(none):/home/svoj/devel/mysql/BUG18233/mysql-5.0
into april.(none):/home/svoj/devel/mysql/BUG18233/mysql-5.1 mysql-test/r/heap.result: Auto merged storage/heap/hp_create.c: Auto merged
Diffstat (limited to 'storage/heap/hp_create.c')
-rw-r--r--storage/heap/hp_create.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/storage/heap/hp_create.c b/storage/heap/hp_create.c
index 329f4b7fa2d..8e185a60262 100644
--- a/storage/heap/hp_create.c
+++ b/storage/heap/hp_create.c
@@ -85,6 +85,7 @@ int heap_create(const char *name, uint keys, HP_KEYDEF *keydef,
if (!my_binary_compare(keyinfo->seg[j].charset))
keyinfo->flag|= HA_END_SPACE_KEY;
keyinfo->flag|= HA_VAR_LENGTH_KEY;
+ length+= 2;
/* Save number of bytes used to store length */
keyinfo->seg[j].bit_start= 1;
break;
@@ -95,6 +96,7 @@ int heap_create(const char *name, uint keys, HP_KEYDEF *keydef,
if (!my_binary_compare(keyinfo->seg[j].charset))
keyinfo->flag|= HA_END_SPACE_KEY;
keyinfo->flag|= HA_VAR_LENGTH_KEY;
+ length+= 2;
/* Save number of bytes used to store length */
keyinfo->seg[j].bit_start= 2;
/*