summaryrefslogtreecommitdiff
path: root/sql/slave.h
diff options
context:
space:
mode:
authorsven@riska.(none) <>2008-02-06 21:07:45 +0100
committersven@riska.(none) <>2008-02-06 21:07:45 +0100
commit5746d8790d57e7f7653ebb94fb22faa29ef8b90e (patch)
treec162802fdefcbba8c3d7286abc5376f120a06b74 /sql/slave.h
parentd4720a4ea17e63822f847bab05a4e01c3648f07d (diff)
parentad316c259e83a0f4d1c142c935c7c0d60f4e187c (diff)
downloadmariadb-git-5746d8790d57e7f7653ebb94fb22faa29ef8b90e.tar.gz
Merge riska.(none):/home/sven/bk/b34355-backslash_in_path_name_under_win/5.0-rpl
into riska.(none):/home/sven/bk/b34355-backslash_in_path_name_under_win/5.1-new-rpl
Diffstat (limited to 'sql/slave.h')
-rw-r--r--sql/slave.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/slave.h b/sql/slave.h
index f1772bbc1fc..b4f1b7f7467 100644
--- a/sql/slave.h
+++ b/sql/slave.h
@@ -80,8 +80,8 @@ class Master_info;
mi->rli does not either.
In Master_info: run_lock, data_lock
- run_lock protects all information about the run state: slave_running, and the
- existence of the I/O thread (to stop/start it, you need this mutex).
+ run_lock protects all information about the run state: slave_running, thd
+ and the existence of the I/O thread to stop/start it, you need this mutex).
data_lock protects some moving members of the struct: counters (log name,
position) and relay log (MYSQL_BIN_LOG object).