diff options
| author | kaa@kaamos.(none) <> | 2008-01-10 20:44:23 +0300 |
|---|---|---|
| committer | kaa@kaamos.(none) <> | 2008-01-10 20:44:23 +0300 |
| commit | 0cec5f8e4bea7ea77198d0dc00b6c800a8c8400f (patch) | |
| tree | 0cf0391032951c314626347136f44ecfaf3def8c /sql/repl_failsafe.cc | |
| parent | a0fbcc032613e5dd18e876ba629be1cfc9261e9d (diff) | |
| parent | a71405371123af3fc8b95b3d38e150435c1cc0e8 (diff) | |
| download | mariadb-git-0cec5f8e4bea7ea77198d0dc00b6c800a8c8400f.tar.gz | |
Merge kaamos.(none):/data/src/mysql-5.1
into kaamos.(none):/data/src/opt/mysql-5.1-opt
Diffstat (limited to 'sql/repl_failsafe.cc')
| -rw-r--r-- | sql/repl_failsafe.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/repl_failsafe.cc b/sql/repl_failsafe.cc index e294cf8ae2d..69f4df723b7 100644 --- a/sql/repl_failsafe.cc +++ b/sql/repl_failsafe.cc @@ -927,7 +927,7 @@ bool load_master_data(THD* thd) 0, (SLAVE_IO | SLAVE_SQL))) my_message(ER_MASTER_INFO, ER(ER_MASTER_INFO), MYF(0)); strmake(active_mi->master_log_name, row[0], - sizeof(active_mi->master_log_name)); + sizeof(active_mi->master_log_name) -1); active_mi->master_log_pos= my_strtoll10(row[1], (char**) 0, &error_2); /* at least in recent versions, the condition below should be false */ if (active_mi->master_log_pos < BIN_LOG_HEADER_SIZE) |