database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge mysql.com:/misc/mysql/31752_/50-31752_

Browse Source 
into  mysql.com:/misc/mysql/31752_/51-31752_
This commit is contained in:
tnurnberg@mysql.com/white.intern.koehntopp.de
2007-12-17 09:16:47 +01:00
parent 6bb485b080 e131a41281
commit efa1061a63
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysys/mf_pack.c
View File

@ -282,7 +282,7 @@ void symdirget(char *dir)
SYNOPSIS SYNOPSIS
unpack_dirname() unpack_dirname()
to Store result here. May be = from to result-buffer, FN_REFLEN characters. may be == from
from 'Packed' directory name (may contain ~) from 'Packed' directory name (may contain ~)
IMPLEMENTATION IMPLEMENTATION
@ -408,7 +408,7 @@ size_t unpack_filename(char * to, const char *from)
/* Convert filename (unix standard) to system standard */ /* Convert filename (unix standard) to system standard */
/* Used before system command's like open(), create() .. */ /* Used before system command's like open(), create() .. */
/* Returns length of to */ /* Returns used length of to; total length should be FN_REFLEN */
size_t system_filename(char * to, const char *from) size_t system_filename(char * to, const char *from)
{ {

2
sql/log.cc
View File

@ -2998,7 +2998,7 @@ err:
void MYSQL_BIN_LOG::make_log_name(char* buf, const char* log_ident) void MYSQL_BIN_LOG::make_log_name(char* buf, const char* log_ident)
{ {
uint dir_len = dirname_length(log_file_name); uint dir_len = dirname_length(log_file_name);
if (dir_len > FN_REFLEN) if (dir_len >= FN_REFLEN)
dir_len=FN_REFLEN-1; dir_len=FN_REFLEN-1;
strnmov(buf, log_file_name, dir_len); strnmov(buf, log_file_name, dir_len);
strmake(buf+dir_len, log_ident, FN_REFLEN - dir_len -1); strmake(buf+dir_len, log_ident, FN_REFLEN - dir_len -1);

5
sql/unireg.cc
View File

@ -228,6 +228,11 @@ bool mysql_create_frm(THD *thd, const char *file_name,
create_info->comment.str : "", create_info->comment.length); create_info->comment.str : "", create_info->comment.length);
forminfo[46]=(uchar) create_info->comment.length; forminfo[46]=(uchar) create_info->comment.length;
#ifdef EXTRA_DEBUG #ifdef EXTRA_DEBUG
/*
EXTRA_DEBUG causes strmake() to initialize its buffer behind the
payload with a magic value to detect wrong buffer-sizes. We
explicitly zero that segment again.
*/
memset((char*) forminfo+47 + forminfo[46], 0, 61 - forminfo[46]); memset((char*) forminfo+47 + forminfo[46], 0, 61 - forminfo[46]);
#endif #endif
#ifdef WITH_PARTITION_STORAGE_ENGINE #ifdef WITH_PARTITION_STORAGE_ENGINE