Commit cb0d64cb authored by Alexey Kopytov's avatar Alexey Kopytov

Fixed loaddata failures on some platforms in PB2.

parent a6cf28a7
...@@ -51,7 +51,7 @@ int my_getwd(char * buf, size_t size, myf MyFlags) ...@@ -51,7 +51,7 @@ int my_getwd(char * buf, size_t size, myf MyFlags)
(long) buf, (uint) size, MyFlags)); (long) buf, (uint) size, MyFlags));
if (size < 1) if (size < 1)
return(-1); DBUG_RETURN(-1);
if (curr_dir[0]) /* Current pos is saved here */ if (curr_dir[0]) /* Current pos is saved here */
(void) strmake(buf,&curr_dir[0],size-1); (void) strmake(buf,&curr_dir[0],size-1);
...@@ -59,12 +59,12 @@ int my_getwd(char * buf, size_t size, myf MyFlags) ...@@ -59,12 +59,12 @@ int my_getwd(char * buf, size_t size, myf MyFlags)
{ {
#if defined(HAVE_GETCWD) #if defined(HAVE_GETCWD)
if (size < 2) if (size < 2)
return(-1); DBUG_RETURN(-1);
if (!getcwd(buf,(uint) (size-2)) && MyFlags & MY_WME) if (!getcwd(buf,(uint) (size-2)) && MyFlags & MY_WME)
{ {
my_errno=errno; my_errno=errno;
my_error(EE_GETWD,MYF(ME_BELL+ME_WAITTANG),errno); my_error(EE_GETWD,MYF(ME_BELL+ME_WAITTANG),errno);
return(-1); DBUG_RETURN(-1);
} }
#elif defined(HAVE_GETWD) #elif defined(HAVE_GETWD)
{ {
...@@ -74,12 +74,12 @@ int my_getwd(char * buf, size_t size, myf MyFlags) ...@@ -74,12 +74,12 @@ int my_getwd(char * buf, size_t size, myf MyFlags)
} }
#elif defined(VMS) #elif defined(VMS)
if (size < 2) if (size < 2)
return(-1); DBUG_RETURN(-1);
if (!getcwd(buf,size-2,1) && MyFlags & MY_WME) if (!getcwd(buf,size-2,1) && MyFlags & MY_WME)
{ {
my_errno=errno; my_errno=errno;
my_error(EE_GETWD,MYF(ME_BELL+ME_WAITTANG),errno); my_error(EE_GETWD,MYF(ME_BELL+ME_WAITTANG),errno);
return(-1); DBUG_RETURN(-1);
} }
intern_filename(buf,buf); intern_filename(buf,buf);
#else #else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment