mirror of
https://github.com/MariaDB/server.git
synced 2025-05-28 13:01:41 +03:00
Bug#18474 Unlistable directories yield no info from information_schema, part2
- Make the windows implementation of 'my_dir' behave like the default implementation
This commit is contained in:
parent
7162b65c24
commit
de6b1b777c
@ -398,14 +398,6 @@ MY_DIR *my_dir(const char *path, myf MyFlags)
|
||||
tmp_file[2]='*';
|
||||
tmp_file[3]='\0';
|
||||
|
||||
#ifdef __BORLANDC__
|
||||
if ((handle= findfirst(tmp_path,&find,0)) == -1L)
|
||||
goto error;
|
||||
#else
|
||||
if ((handle=_findfirst(tmp_path,&find)) == -1L)
|
||||
goto error;
|
||||
#endif
|
||||
|
||||
if (!(buffer= my_malloc(ALIGN_SIZE(sizeof(MY_DIR)) +
|
||||
ALIGN_SIZE(sizeof(DYNAMIC_ARRAY)) +
|
||||
sizeof(MEM_ROOT), MyFlags)))
|
||||
@ -425,7 +417,23 @@ MY_DIR *my_dir(const char *path, myf MyFlags)
|
||||
|
||||
/* MY_DIR structure is allocated and completly initialized at this point */
|
||||
result= (MY_DIR*)buffer;
|
||||
|
||||
|
||||
#ifdef __BORLANDC__
|
||||
if ((handle= findfirst(tmp_path,&find,0)) == -1L)
|
||||
#else
|
||||
if ((handle=_findfirst(tmp_path,&find)) == -1L)
|
||||
#endif
|
||||
{
|
||||
DBUG_PRINT("info", ("find_first returned error"));
|
||||
if (errno != EINVAL)
|
||||
goto error;
|
||||
/*
|
||||
Could not read the directory, no read access.
|
||||
Probably because by "chmod -r".
|
||||
continue and return zero files in dir
|
||||
*/
|
||||
}
|
||||
|
||||
do
|
||||
{
|
||||
#ifdef __BORLANDC__
|
||||
|
Loading…
x
Reference in New Issue
Block a user