diff options
| author | unknown <tsmith@ramayana.hindu.god> | 2008-01-22 15:56:15 -0700 |
|---|---|---|
| committer | unknown <tsmith@ramayana.hindu.god> | 2008-01-22 15:56:15 -0700 |
| commit | 6c26935035ce6fc646fc448dc181d9a3a870cd54 (patch) | |
| tree | 22de11d4d65b9eb7c56b5e80669f19cf9ff242f4 /sql/repl_failsafe.cc | |
| parent | 74c9f82afb1d145636b91eff4b26131fd60e4f68 (diff) | |
| parent | 37ff91b3bfdb946743e36ddd13bfda71598f45a8 (diff) | |
| download | mariadb-git-6c26935035ce6fc646fc448dc181d9a3a870cd54.tar.gz | |
Merge ramayana.hindu.god:/home/tsmith/m/bk/51
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
client/mysqldump.c:
Auto merged
configure.in:
Auto merged
sql/field.cc:
Auto merged
sql/filesort.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/log.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/item_sum.cc:
Manual merge.
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 d33c81b55e8..589ee8b2605 100644 --- a/sql/repl_failsafe.cc +++ b/sql/repl_failsafe.cc @@ -946,7 +946,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) |