diff options
| author | unknown <evgen@moonbone.local> | 2006-08-02 16:46:55 +0400 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2006-08-02 16:46:55 +0400 |
| commit | 0825bad93aaeaa64a907250263146adef8187405 (patch) | |
| tree | acb2670164a1b5cec9a775f963d19c2329e446fd /scripts | |
| parent | c102fe94adf39b2ed472794e0a8c72d16ddbeb74 (diff) | |
| parent | 328e8c74308fbd73236a324c30a64fb3f9d9c672 (diff) | |
| download | mariadb-git-0825bad93aaeaa64a907250263146adef8187405.tar.gz | |
Merge moonbone.local:/work/tmp_merge-4.1-opt-mysql
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
mysql-test/Makefile.am:
Auto merged
scripts/make_win_src_distribution.sh:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
client/mysqltest.c:
Manual merge
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/make_win_src_distribution.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/make_win_src_distribution.sh b/scripts/make_win_src_distribution.sh index d9333540ab8..6206ca64121 100644 --- a/scripts/make_win_src_distribution.sh +++ b/scripts/make_win_src_distribution.sh @@ -206,7 +206,7 @@ copy_dir_files() for i in *.c *.cpp *.h *.ih *.i *.ic *.asm *.def *.hpp *.yy *dsp *.dsw \ README INSTALL* LICENSE AUTHORS NEWS ChangeLog \ *.inc *.test *.result *.pem Moscow_leap des_key_file \ - *.vcproj *.sln *.dat *.000001 *.require *.opt + *.vcproj *.sln *.dat *.000001 *.require *.opt *.cnf do if [ -f $i ] then |