diff options
| author | unknown <monty@mysql.com> | 2004-02-04 09:51:28 +0100 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-02-04 09:51:28 +0100 |
| commit | 128fac05325940c118ed49a46276397c59925f66 (patch) | |
| tree | 2b2da0db43e6940a79172a7f84e00f891034fd5a /sql/mysqld.cc | |
| parent | 4b44b849ba7ba7e8c5e7de5de40726888f21f847 (diff) | |
| parent | 4d98ab822b241ddc8dbea71db8451bb81a32f2ca (diff) | |
| download | mariadb-git-128fac05325940c118ed49a46276397c59925f66.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'sql/mysqld.cc')
| -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, |