summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorunknown <ramil/ram@ramil.myoffice.izhnet.ru>2008-02-12 15:14:56 +0400
committerunknown <ramil/ram@ramil.myoffice.izhnet.ru>2008-02-12 15:14:56 +0400
commitef017705b252537af89f171bf88bc2ab44f315b7 (patch)
tree9191517a897a4023faa987a9cec5799ee802dd7a /storage
parent629b355b4a2bc051e538244410edc1e3d0933a65 (diff)
parent863b86db2485dddbfdbb8200531b7af265daa5db (diff)
downloadmariadb-git-ef017705b252537af89f171bf88bc2ab44f315b7.tar.gz
Merge mysql.com:/home/ram/work/b33758/b33758.5.0
into mysql.com:/home/ram/work/b33758/b33758.5.1 storage/myisam/mi_open.c: Auto merged
Diffstat (limited to 'storage')
-rw-r--r--storage/myisam/mi_open.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/storage/myisam/mi_open.c b/storage/myisam/mi_open.c
index de42bdcd53d..d4e513a1c5d 100644
--- a/storage/myisam/mi_open.c
+++ b/storage/myisam/mi_open.c
@@ -281,6 +281,9 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags)
if (share->options & HA_OPTION_COMPRESS_RECORD)
share->base.max_key_length+=2; /* For safety */
+ /* Add space for node pointer */
+ share->base.max_key_length+= share->base.key_reflength;
+
if (!my_multi_malloc(MY_WME,
&share,sizeof(*share),
&share->state.rec_per_key_part,sizeof(long)*key_parts,