diff options
| author | unknown <sasha@asksasha.com> | 2005-08-01 13:34:04 -0600 |
|---|---|---|
| committer | unknown <sasha@asksasha.com> | 2005-08-01 13:34:04 -0600 |
| commit | 275150580bdc867dbcc0c58d23d152f94b2bb4f7 (patch) | |
| tree | f883b1b876904c2c351e702520eea79ee66ac79f /sql | |
| parent | b86a3bc339a3610860c5c760f2b5d029b0f4061d (diff) | |
| parent | 63e9a87af7323e7f9c46813caadafe31a3a17d6e (diff) | |
| download | mariadb-git-275150580bdc867dbcc0c58d23d152f94b2bb4f7.tar.gz | |
Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1
into asksasha.com:/reiser-data/mysql-dev/mysql-4.1
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/slave.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index f25ad90487a..a0cc773d44f 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -2186,7 +2186,8 @@ int show_master_info(THD* thd, MASTER_INFO* mi) &my_charset_bin); protocol->store((ulonglong) mi->rli.group_relay_log_pos); protocol->store(mi->rli.group_master_log_name, &my_charset_bin); - protocol->store(mi->slave_running ? "Yes":"No", &my_charset_bin); + protocol->store(mi->slave_running == MYSQL_SLAVE_RUN_CONNECT + ? "Yes":"No", &my_charset_bin); protocol->store(mi->rli.slave_running ? "Yes":"No", &my_charset_bin); protocol->store(&replicate_do_db); protocol->store(&replicate_ignore_db); |