diff options
| author | acurtis@xiphis.org <> | 2005-08-11 12:18:53 +0100 |
|---|---|---|
| committer | acurtis@xiphis.org <> | 2005-08-11 12:18:53 +0100 |
| commit | b9476f7d50e9911ea83f304351e5cab7a3880089 (patch) | |
| tree | 7e424eae0123e35fa5eec3670a550a310c6e1916 /sql/slave.cc | |
| parent | 0f75d647349694d820923342325440e9abdd49a6 (diff) | |
| parent | 3b64651683a6f8d9276fd49843832f672312f880 (diff) | |
| download | mariadb-git-b9476f7d50e9911ea83f304351e5cab7a3880089.tar.gz | |
Merge xiphis.org:/usr/home/antony/work2/mysql-4.1
into xiphis.org:/usr/home/antony/work2/merge-5.0
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index c09753d805b..d2a60076cef 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -2396,8 +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 == MYSQL_SLAVE_RUN_CONNECT - ? "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); |