diff options
| author | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-11-26 09:19:30 +0100 |
|---|---|---|
| committer | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-11-26 09:19:30 +0100 |
| commit | d7d7b10b532691186d047e44cb200b30a59c4d75 (patch) | |
| tree | 04b3a63eff036ac7a73739d3a0f05402d87deecd /sql/repl_failsafe.cc | |
| parent | 7ba06230a72d2c76f4c01d19ae0087296ef11301 (diff) | |
| parent | 1c72446ef69cf6c50cf9b2dae69b2b24a7576103 (diff) | |
| download | mariadb-git-d7d7b10b532691186d047e44cb200b30a59c4d75.tar.gz | |
Merge mysql.com:/misc/mysql/31752_/50-31752_
into mysql.com:/misc/mysql/31752_/51-31752_
client/mysql.cc:
Auto merged
sql/log.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sp.cc:
manual merge
strings/strmake.c:
SCCS merged
sql/unireg.cc:
SCCS merged
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 834d87532af..453c26725d2 100644 --- a/sql/repl_failsafe.cc +++ b/sql/repl_failsafe.cc @@ -925,7 +925,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) |