diff options
| author | unknown <kaa@kaamos.(none)> | 2008-01-10 20:44:23 +0300 |
|---|---|---|
| committer | unknown <kaa@kaamos.(none)> | 2008-01-10 20:44:23 +0300 |
| commit | 824ced465e8f1527a6336236d0352e2a16442c5d (patch) | |
| tree | 0cf0391032951c314626347136f44ecfaf3def8c /sql/repl_failsafe.cc | |
| parent | c8f6457f650845ab1f9e04b2136b8351e4d465aa (diff) | |
| parent | cd6dc10c4602e056b0892714dbe35eba497a40f2 (diff) | |
| download | mariadb-git-824ced465e8f1527a6336236d0352e2a16442c5d.tar.gz | |
Merge kaamos.(none):/data/src/mysql-5.1
into kaamos.(none):/data/src/opt/mysql-5.1-opt
client/mysql.cc:
Auto merged
client/mysqltest.c:
Auto merged
sql/log.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto 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 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) |