diff options
author | Chad MILLER <chad@mysql.com> | 2008-07-10 14:47:53 -0400 |
---|---|---|
committer | Chad MILLER <chad@mysql.com> | 2008-07-10 14:47:53 -0400 |
commit | 06756c19c5a27a5240dc1dd7c243c32db04ccf00 (patch) | |
tree | d78d316822f255f22093dc0cc26ea8943b5f91d4 /sql/repl_failsafe.cc | |
parent | 93aba6a8835210d6065ccb2f74114b64502a702b (diff) | |
parent | ac15eee942b492764690b634570ca32bda446b6c (diff) | |
download | mariadb-git-06756c19c5a27a5240dc1dd7c243c32db04ccf00.tar.gz |
Merge chunk from trunk.
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 6c403065d19..65bf755b3f0 100644 --- a/sql/repl_failsafe.cc +++ b/sql/repl_failsafe.cc @@ -922,7 +922,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) |