diff options
| author | monty@tik.mysql.fi <> | 2002-03-10 20:13:07 +0200 |
|---|---|---|
| committer | monty@tik.mysql.fi <> | 2002-03-10 20:13:07 +0200 |
| commit | c4b8c1b6c053a51d5c4187145741dda5ea20715a (patch) | |
| tree | f713009806d7833675627425ca06b2e66b0db275 /sql/sql_repl.cc | |
| parent | 2939863e87cdf4eceeb2e73ea27f8dcc478fa841 (diff) | |
| parent | d993a1c0c49ab200203993a8b20fb5ab02b930e2 (diff) | |
| download | mariadb-git-c4b8c1b6c053a51d5c4187145741dda5ea20715a.tar.gz | |
Merge hundin:/my/mysql-4.0 into tik.mysql.fi:/home/my/mysql-4.0
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 0b408920703..c6384817512 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -562,6 +562,8 @@ int start_slave(THD* thd , MASTER_INFO* mi, bool net_report) return 1; lock_slave_threads(mi); // this allows us to cleanly read slave_running init_thread_mask(&thread_mask,mi,1 /* inverse */); + if (thd->lex.slave_thd_opt) + thread_mask &= thd->lex.slave_thd_opt; if (thread_mask) { if (server_id_supplied && (!mi->inited || (mi->inited && *mi->host))) @@ -602,6 +604,8 @@ int stop_slave(THD* thd, MASTER_INFO* mi, bool net_report ) int thread_mask; lock_slave_threads(mi); init_thread_mask(&thread_mask,mi,0 /* not inverse*/); + if (thd->lex.slave_thd_opt) + thread_mask &= thd->lex.slave_thd_opt; slave_errno = (thread_mask) ? terminate_slave_threads(mi,thread_mask, 1 /*skip lock */) : ER_SLAVE_NOT_RUNNING; |