diff options
| author | monty@mysql.com <> | 2004-02-04 09:51:28 +0100 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-02-04 09:51:28 +0100 |
| commit | 496f340060505d8e7f4add9eb183f9586329234a (patch) | |
| tree | 2b2da0db43e6940a79172a7f84e00f891034fd5a /sql | |
| parent | f7e65a76209b5cdce45675e88ca96114e18eda98 (diff) | |
| parent | 6e188089ceced731f93b0388deebdaa8665b539d (diff) | |
| download | mariadb-git-496f340060505d8e7f4add9eb183f9586329234a.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 68b6b153f5b..e198d477b68 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -4043,7 +4043,7 @@ this value; if zero (the default): when the size exceeds max_binlog_size. \ "Use compression on master/slave 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, "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, |