diff options
| author | unknown <sasha@asksasha.com> | 2005-07-28 19:08:01 -0600 |
|---|---|---|
| committer | unknown <sasha@asksasha.com> | 2005-07-28 19:08:01 -0600 |
| commit | 324c1b47f047f25f0d4c60e704a863de1b01837a (patch) | |
| tree | 9a58290a1065303ae7743eb1b69adc7822921171 /sql/slave.cc | |
| parent | bb15892421beb65e227cb5a615b25516a35502cd (diff) | |
| download | mariadb-git-324c1b47f047f25f0d4c60e704a863de1b01837a.tar.gz | |
patch for bug 10780
sql/slave.cc:
bug 10780
sql/slave.h:
bug 10780
mysql-test/r/rpl_slave_status.result:
New BitKeeper file ``mysql-test/r/rpl_slave_status.result''
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index f25ad90487a..286bb07e4c9 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); @@ -3078,7 +3079,7 @@ slave_begin: pthread_mutex_lock(&LOCK_thread_count); threads.append(thd); pthread_mutex_unlock(&LOCK_thread_count); - mi->slave_running = 1; + mi->slave_running = MYSQL_SLAVE_RUN_INIT; mi->abort_slave = 0; pthread_mutex_unlock(&mi->run_lock); pthread_cond_broadcast(&mi->start_cond); |