diff options
author | unknown <monty@hundin.mysql.fi> | 2002-03-15 22:01:45 +0200 |
---|---|---|
committer | unknown <monty@hundin.mysql.fi> | 2002-03-15 22:01:45 +0200 |
commit | b70f53b28940008233995d885584c2e0984e3bf4 (patch) | |
tree | 03dff9bdb5901c630b301d79b1d20e9d6b588a11 | |
parent | e115cefe1b66bcf10b0afd84da581074a0496d68 (diff) | |
download | mariadb-git-b70f53b28940008233995d885584c2e0984e3bf4.tar.gz |
Fix max buffer length
-rw-r--r-- | client/mysql.cc | 2 | ||||
-rw-r--r-- | client/mysqldump.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 22213b8edf5..772444764c9 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -437,7 +437,7 @@ CHANGEABLE_VAR changeable_vars[] = { { "connect_timeout", (long*) &opt_connect_timeout, 0, 0, 3600*12, 0, 1}, { "max_allowed_packet", (long*) &max_allowed_packet,16*1024L*1024L,4096, 24*1024L*1024L, MALLOC_OVERHEAD,1024}, - { "net_buffer_length",(long*) &net_buffer_length,16384,1024,24*1024*1024L, + { "net_buffer_length",(long*) &net_buffer_length,16384,1024,16*1024*1024L, MALLOC_OVERHEAD,1024}, { "select_limit", (long*) &select_limit, 1000L, 1, ~0L, 0, 1}, { "max_join_size", (long*) &max_join_size, 1000000L, 1, ~0L, 0, 1}, diff --git a/client/mysqldump.c b/client/mysqldump.c index afda499029f..a133b2959f2 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -147,9 +147,9 @@ static const char *load_default_groups[]= { "mysqldump","client",0 }; CHANGEABLE_VAR md_changeable_vars[] = { { "max_allowed_packet", (long*) &max_allowed_packet,24*1024*1024,4096, - 24*1024L*1024L,MALLOC_OVERHEAD,1024}, + 16*1024L*1024L,MALLOC_OVERHEAD,1024}, { "net_buffer_length", (long*) &net_buffer_length,1024*1024L-1025,4096, - 24*1024L*1024L,MALLOC_OVERHEAD-1024,1024}, + 16*1024L*1024L,MALLOC_OVERHEAD+1024,1024}, { 0, 0, 0, 0, 0, 0, 0} }; |