Commit ef017705 authored by unknown's avatar unknown

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
parents 629b355b 863b86db
......@@ -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,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment