Commit 550c4eb7 authored by unknown's avatar unknown
Browse files

Bug #5539 SHOW DATABASES LIKE and symlinks 

sql_show.cc:
  Made change suggested by Serge. REmoved else in mysql_find_files so symlink files fall through to the wildcard check


sql/sql_show.cc:
  Made change suggested by Serge. REmoved else in mysql_find_files so symlink files fall through to the wildcard check
parent ecd3172b

sql/sql_show.cc

+5 −10
Original line number Diff line number Diff line
@@ -193,29 +193,24 @@ mysql_find_files(THD *thd,List<char> *files, const char *db,const char *path, 
    {                                           /* Return databases */

#ifdef USE_SYMDIR

      char *ext;

      char buff[FN_REFLEN];

      if (my_use_symdir && !strcmp(ext=fn_ext(file->name), ".sym"))

      {

	/* Only show the sym file if it points to a directory */

	char buff[FN_REFLEN], *end;

	MY_STAT status;

	char *end;

        *ext=0;                                 /* Remove extension */

	unpack_dirname(buff, file->name);

	end= strend(buff);

	if (end != buff && end[-1] == FN_LIBCHAR)

	  end[-1]= 0;				// Remove end FN_LIBCHAR

	if (!my_stat(buff, &status, MYF(0)) ||

	    !MY_S_ISDIR(status.st_mode) ||

            (wild && wild_compare(file->name, wild, 0)))

        if (!my_stat(buff, file->mystat, MYF(0)))

               continue;

       }

      else

#endif

      {

        if (file->name[0] == '.' || !MY_S_ISDIR(file->mystat->st_mode) ||

            (wild && wild_compare(file->name,wild, 0)))

          continue;

    }

    }

    else

    {

        // Return only .frm files which aren't temp files.