Commit 799e4522 authored by unknown's avatar unknown
Browse files

Merge mdk10.(none):/home/reggie/bk/mysql-4.1 

into mdk10.(none):/home/reggie/bk/mysql-5.0


sql/sql_show.cc:
  Auto merged
parents 4a49d3f3 32e027ea

sql/sql_show.cc

+1 −2
Original line number Diff line number Diff line
@@ -704,12 +704,11 @@ static void append_directory(THD *thd, String *packet, const char *dir_type, 
    packet->append(dir_type);

    packet->append(" DIRECTORY='", 12);

#ifdef __WIN__

    char *winfilename = strdup(filename);

    char *winfilename = thd->memdup(filename, length);

    for (uint i=0; i < length; i++)

	    if (winfilename[i] == '\\')

		    winfilename[i] = '/';

    packet->append(winfilename, length);

    free(winfilename);

#else

    packet->append(filename, length);

#endif