diff options
| author | unknown <kent@mysql.com> | 2005-12-14 13:18:24 +0100 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2005-12-14 13:18:24 +0100 |
| commit | 98380e561bc6864aadcd576740a6431a301417a3 (patch) | |
| tree | 0d79531cb8940aa51ee43b2b10f6972f7d39bc1c /scripts | |
| parent | 8cc164cac27a513dc32ed5fc8c9cb41f4ef49173 (diff) | |
| parent | 2ee62d18e6d4b1efbd8ef662495995b1ab006b00 (diff) | |
| download | mariadb-git-98380e561bc6864aadcd576740a6431a301417a3.tar.gz | |
Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
mysql-test/r/skip_name_resolve.result:
Auto merged
mysql-test/t/skip_name_resolve.test:
Auto merged
sql/sp_head.cc:
Auto merged
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/make_win_src_distribution.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/make_win_src_distribution.sh b/scripts/make_win_src_distribution.sh index ea3ca66db6e..53f05c131ac 100644 --- a/scripts/make_win_src_distribution.sh +++ b/scripts/make_win_src_distribution.sh @@ -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 \ |