1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00

Merge kaamos.(none):/data/src/mysql-5.1

into  kaamos.(none):/data/src/opt/mysql-5.1-opt
This commit is contained in:
kaa@kaamos.(none)
2008-01-10 20:44:23 +03:00
41 changed files with 678 additions and 149 deletions

View File

@ -3005,10 +3005,10 @@ err:
void MYSQL_BIN_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);
}