diff options
| author | unknown <sven@riska.(none)> | 2008-02-06 21:07:45 +0100 |
|---|---|---|
| committer | unknown <sven@riska.(none)> | 2008-02-06 21:07:45 +0100 |
| commit | ea7ecda29b0d8e542e8d309acf500c05f29a5445 (patch) | |
| tree | c162802fdefcbba8c3d7286abc5376f120a06b74 /sql/slave.h | |
| parent | 781de1968802032b600704112a8b3fa7fa64d0a7 (diff) | |
| parent | 7b82376f0a27228705aa0f4e988a7f881aea555c (diff) | |
| download | mariadb-git-ea7ecda29b0d8e542e8d309acf500c05f29a5445.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
client/mysqlbinlog.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
Diffstat (limited to 'sql/slave.h')
| -rw-r--r-- | sql/slave.h | 4 |
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). |