Commit 26eb5ff0 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release


scripts/make_win_src_distribution.sh:
  Auto merged
parents 171d9fcb ff410f95

scripts/make_win_src_distribution.sh

+2 −2
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ copy_dir_files() 
       print_debug "Creating directory '$arg'"

       mkdir $BASE/$arg

     fi

    for i in *.c *.cpp *.h *.ih *.i *.ic *.asm *.def *.hpp *.dsp *.dsw \

    for i in *.c *.cpp *.h *.ih *.i *.ic *.asm *.def *.hpp \

             README INSTALL* LICENSE AUTHORS NEWS ChangeLog \

             *.inc *.test *.result *.pem Moscow_leap des_key_file \

             *.vcproj *.sln *.dat *.000001 *.require *.opt
@@ -342,7 +342,7 @@ mv $BASE/sql/sql_yacc.cpp-new $BASE/sql/sql_yacc.cpp 
#

# Search the tree for plain text files and adapt the line end marker

#

find $BASE \( -name "*.dsp" -o -name "*.dsw" -o -name "*.cnf" -o -name "*.ini" \

find $BASE \( -name "*.cnf" -o -name "*.ini" \

           -o -name COPYING -o -name ChangeLog -o -name EXCEPTIONS-CLIENT \

           -o -name "INSTALL*" -o -name LICENSE -o -name "README*" \

           -o -name "*.vcproj" -o -name "*.sln" \) -type f -print \