Commit 128fac05 authored by unknown's avatar unknown

Merge bk-internal.mysql.com:/home/bk/mysql-4.0

into mysql.com:/home/my/mysql-4.0


sql/mysqld.cc:
  Auto merged
parents 4b44b849 4d98ab82
...@@ -4043,7 +4043,7 @@ this value; if zero (the default): when the size exceeds max_binlog_size. \ ...@@ -4043,7 +4043,7 @@ this value; if zero (the default): when the size exceeds max_binlog_size. \
"Use compression on master/slave protocol", "Use compression on master/slave protocol",
(gptr*) &opt_slave_compressed_protocol, (gptr*) &opt_slave_compressed_protocol,
(gptr*) &opt_slave_compressed_protocol, (gptr*) &opt_slave_compressed_protocol,
0, GET_BOOL, REQUIRED_ARG, 0, 0, 1, 0, 1, 0}, 0, GET_BOOL, NO_ARG, 0, 0, 1, 0, 1, 0},
{"slave_net_timeout", OPT_SLAVE_NET_TIMEOUT, {"slave_net_timeout", OPT_SLAVE_NET_TIMEOUT,
"Number of seconds to wait for more data from a master/slave connection before aborting the read.", "Number of seconds to wait for more data from a master/slave connection before aborting the read.",
(gptr*) &slave_net_timeout, (gptr*) &slave_net_timeout, 0, (gptr*) &slave_net_timeout, (gptr*) &slave_net_timeout, 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