Commit ff0504b0 authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi

merge

parents f0e835ac 63e106f0
...@@ -149,7 +149,7 @@ CHANGEABLE_VAR md_changeable_vars[] = { ...@@ -149,7 +149,7 @@ CHANGEABLE_VAR md_changeable_vars[] = {
{ "max_allowed_packet", (long*) &max_allowed_packet,24*1024*1024,4096, { "max_allowed_packet", (long*) &max_allowed_packet,24*1024*1024,4096,
512*1024L*1024L,MALLOC_OVERHEAD,1024}, 512*1024L*1024L,MALLOC_OVERHEAD,1024},
{ "net_buffer_length", (long*) &net_buffer_length,1024*1024L-1025,4096, { "net_buffer_length", (long*) &net_buffer_length,1024*1024L-1025,4096,
512*1024L*1024L,MALLOC_OVERHEAD,1024}, 512*1024L*1024L,MALLOC_OVERHEAD+1024,1024},
{ 0, 0, 0, 0, 0, 0, 0} { 0, 0, 0, 0, 0, 0, 0}
}; };
......
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