diff options
| author | unknown <knielsen@mysql.com> | 2006-01-17 18:35:16 +0100 |
|---|---|---|
| committer | unknown <knielsen@mysql.com> | 2006-01-17 18:35:16 +0100 |
| commit | 5e54f45fadc4e4d21032c3d22c98be5d0f9fc0fd (patch) | |
| tree | a4ff4cfe28348ba4fc3fbae81f6f449288073153 /scripts | |
| parent | 35137c3d91746f7e5470502597646a5e7e042c76 (diff) | |
| parent | 0892c0f5fe51e99000e256ac9a71b12884201645 (diff) | |
| download | mariadb-git-5e54f45fadc4e4d21032c3d22c98be5d0f9fc0fd.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.1-new
into mysql.com:/usr/local/mysql/mysql-5.1-relmerge
include/config-win.h:
Auto merged
sql/log_event.h:
Auto merged
sql/log_event.cc:
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 065c7d06d24..2f2d6bb393e 100644 --- a/scripts/make_win_src_distribution.sh +++ b/scripts/make_win_src_distribution.sh @@ -249,7 +249,7 @@ copy_dir_dirs() { # Input directories to be copied # -for i in client dbug extra storage/heap include \ +for i in client dbug extra storage/heap include storage/archive \ libmysql libmysqld storage/myisam \ storage/myisammrg mysys regex sql strings sql-common sql/examples \ tools vio zlib |