diff options
| author | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-11-26 09:00:41 +0100 |
|---|---|---|
| committer | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-11-26 09:00:41 +0100 |
| commit | fe280afa26ba21f6c1ba3edc83e930eff96704d0 (patch) | |
| tree | 198fef3c0399dd79a990104be1deec976b3ae8ea /sql/repl_failsafe.cc | |
| parent | ae5ec36bcb2f20fc63c7b069330d3b826a68f9da (diff) | |
| parent | a905ac34b59731bb69a036306297c50742753329 (diff) | |
| download | mariadb-git-fe280afa26ba21f6c1ba3edc83e930eff96704d0.tar.gz | |
Merge mysql.com:/misc/mysql/31752_/41-31752_
into mysql.com:/misc/mysql/31752_/50-31752_
sql/log.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.cc:
Auto merged
strings/strmake.c:
Auto merged
sql/sql_show.cc:
manually merged
sql/unireg.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 1dc16b6e566..896315ec82f 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) |