diff options
| author | unknown <jimw@mysql.com> | 2005-08-01 17:08:38 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-08-01 17:08:38 -0700 |
| commit | 8fc1e27fb7604b93358a15f26a0c849faa21a1ca (patch) | |
| tree | c024aa889db980a0023e67986522da1c5a3d0aad /sql | |
| parent | c33f7f9f9064d95a73778c0e962e20a267bccaad (diff) | |
| parent | 275150580bdc867dbcc0c58d23d152f94b2bb4f7 (diff) | |
| download | mariadb-git-8fc1e27fb7604b93358a15f26a0c849faa21a1ca.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into mysql.com:/home/jimw/my/mysql-5.0-clean
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
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 eed70b01cd2..c09753d805b 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -2396,7 +2396,8 @@ bool 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); |