diff options
| author | unknown <kent@mysql.com> | 2005-12-12 16:12:36 +0100 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2005-12-12 16:12:36 +0100 |
| commit | fb0d4c3b41969b19797a3827fd4802d23be35d51 (patch) | |
| tree | c6f247b20709b50f20f1e68f538c1a09f9cf7ddf /scripts | |
| parent | ca7b228d633c55650ec9797521ef3f9faa5763af (diff) | |
| parent | ff410f95f56963171cc903d9ff906579f0716ef7 (diff) | |
| download | mariadb-git-fb0d4c3b41969b19797a3827fd4802d23be35d51.tar.gz | |
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
mysql-test/t/symlink.test:
Auto merged
scripts/make_win_src_distribution.sh:
Auto merged
sql/mysqld.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 1f36108a5c4..065c7d06d24 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 \ |