Dep/MySQL: Updated MySQL sources to version 5.5.9 (current GA)
This commit is contained in:
@@ -34,7 +34,7 @@ char * my_load_path(char * to, const char *path,
|
||||
|
||||
if ((path[0] == FN_HOMELIB && path[1] == FN_LIBCHAR) ||
|
||||
test_if_hard_path(path))
|
||||
VOID(strnmov(buff, path, FN_REFLEN));
|
||||
(void) strnmov(buff, path, FN_REFLEN);
|
||||
else if ((is_cur=(path[0] == FN_CURLIB && path[1] == FN_LIBCHAR)) ||
|
||||
(is_prefix(path,FN_PARENTDIR)) ||
|
||||
! own_path_prefix)
|
||||
@@ -42,12 +42,12 @@ char * my_load_path(char * to, const char *path,
|
||||
if (is_cur)
|
||||
is_cur=2; /* Remove current dir */
|
||||
if (! my_getwd(buff,(uint) (FN_REFLEN-strlen(path)+is_cur),MYF(0)))
|
||||
VOID(strncat(buff, path+is_cur, FN_REFLEN-1));
|
||||
(void) strncat(buff, path+is_cur, FN_REFLEN-1);
|
||||
else
|
||||
VOID(strnmov(buff, path, FN_REFLEN)); /* Return org file name */
|
||||
(void) strnmov(buff, path, FN_REFLEN); /* Return org file name */
|
||||
}
|
||||
else
|
||||
VOID(strxnmov(buff, FN_REFLEN, own_path_prefix,path, NullS));
|
||||
(void) strxnmov(buff, FN_REFLEN, own_path_prefix, path, NullS);
|
||||
strnmov(to, buff, FN_REFLEN);
|
||||
to[FN_REFLEN-1]= '\0';
|
||||
DBUG_PRINT("exit",("to: %s",to));
|
||||
|
||||
Reference in New Issue
Block a user