diff options
| author | unknown <tnurnberg@mysql.com/white.intern.koehntopp.de> | 2007-12-17 09:13:38 +0100 |
|---|---|---|
| committer | unknown <tnurnberg@mysql.com/white.intern.koehntopp.de> | 2007-12-17 09:13:38 +0100 |
| commit | 02cdb7eccab6fe262d4a9d430f9d23eb51ac4839 (patch) | |
| tree | d9da04544a6b5068bf1a6d8cbd638b7563676d41 /sql/log.cc | |
| parent | 1c72446ef69cf6c50cf9b2dae69b2b24a7576103 (diff) | |
| parent | 0805384869656fc9efaa28de331e825aa8b885d7 (diff) | |
| download | mariadb-git-02cdb7eccab6fe262d4a9d430f9d23eb51ac4839.tar.gz | |
Merge mysql.com:/misc/mysql/31752_/41-31752_
into mysql.com:/misc/mysql/31752_/50-31752_
mysys/mf_pack.c:
Auto merged
sql/log.cc:
Auto merged
sql/sql_show.cc:
manual merge
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 079384f18fe..3afc5f3a57d 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -1287,7 +1287,7 @@ 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 -1); |