diff options
author | monty@mashka.mysql.fi <> | 2003-08-19 00:08:08 +0300 |
---|---|---|
committer | monty@mashka.mysql.fi <> | 2003-08-19 00:08:08 +0300 |
commit | 4f7512160bfd467e5d53c3e133e1842fac2737ce (patch) | |
tree | df4f8c8cf4d399e322333c5516d5c19507b1fda8 /heap | |
parent | 2263e3e51faba531a0a7055dbf706a6a8719ad70 (diff) | |
download | mariadb-git-4f7512160bfd467e5d53c3e133e1842fac2737ce.tar.gz |
After merge fixes
Use server character set if --default-character-set is not used
Added convert_string() for more efficient alloc+character-set convert of strings
Diffstat (limited to 'heap')
-rw-r--r-- | heap/hp_create.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/heap/hp_create.c b/heap/hp_create.c index 5265607ce53..02725576c8f 100644 --- a/heap/hp_create.c +++ b/heap/hp_create.c @@ -50,6 +50,7 @@ int heap_create(const char *name, uint keys, HP_KEYDEF *keydef, length+= keyinfo->seg[j].length; if (keyinfo->seg[j].null_bit) { + length++; if (!(keyinfo->flag & HA_NULL_ARE_EQUAL)) keyinfo->flag|= HA_NULL_PART_KEY; if (keyinfo->algorithm == HA_KEY_ALG_BTREE) |