diff options
| author | tnurnberg@white.intern.koehntopp.de <> | 2007-12-17 09:45:36 +0100 |
|---|---|---|
| committer | tnurnberg@white.intern.koehntopp.de <> | 2007-12-17 09:45:36 +0100 |
| commit | f7aa719268212bdbc7d48e55dd51cf47dc4e034a (patch) | |
| tree | e4b2848c7525b508ab99249f5aa768c7b5061077 /sql/log.cc | |
| parent | ca5f50788ed89d3155828984bef7e3898aba47e0 (diff) | |
| parent | e131a412815767bb8590c3831fd2797c10112ab8 (diff) | |
| download | mariadb-git-f7aa719268212bdbc7d48e55dd51cf47dc4e034a.tar.gz | |
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into mysql.com:/misc/mysql/31752_/50-31752_
Diffstat (limited to 'sql/log.cc')
| -rw-r--r-- | sql/log.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/log.cc b/sql/log.cc index af03cecd462..e66d965c613 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -1284,10 +1284,10 @@ err: void MYSQL_LOG::make_log_name(char* buf, const char* log_ident) { uint dir_len = dirname_length(log_file_name); - if (dir_len > FN_REFLEN) + 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); } |