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/log.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/log.cc')
| -rw-r--r-- | sql/log.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/log.cc b/sql/log.cc index e9aa273676a..079384f18fe 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -1290,7 +1290,7 @@ void MYSQL_LOG::make_log_name(char* buf, const char* log_ident) if (dir_len > FN_REFLEN) dir_len=FN_REFLEN-1; strnmov(buf, log_file_name, dir_len); - strmake(buf+dir_len, log_ident, FN_REFLEN - dir_len); + strmake(buf+dir_len, log_ident, FN_REFLEN - dir_len -1); } |