diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-12-08 16:53:59 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-12-08 16:53:59 +0100 |
| commit | c9097f3293fc92a35da489747373e70a7fdec80a (patch) | |
| tree | 4c80fa843ed9d53e8d1b77da1398879d83562da5 /scripts | |
| parent | 6bcdfc449ede4453f4d3f0d0a89d7e703961b2bb (diff) | |
| parent | 7ab203c4e840025c2a075fe496d273e23dae4973 (diff) | |
| download | mariadb-git-c9097f3293fc92a35da489747373e70a7fdec80a.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
client/mysqltest.c:
Auto merged
mysql-test/Makefile.am:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/sql_class.h:
Auto merged
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/make_binary_distribution.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh index 8b09022c32f..00b173aecc3 100644 --- a/scripts/make_binary_distribution.sh +++ b/scripts/make_binary_distribution.sh @@ -248,7 +248,7 @@ $CP mysql-test/t/*.def $BASE/mysql-test/t $CP mysql-test/std_data/*.dat mysql-test/std_data/*.frm \ mysql-test/std_data/*.pem mysql-test/std_data/Moscow_leap \ mysql-test/std_data/des_key_file mysql-test/std_data/*.*001 \ - mysql-test/std_data/*.cnf \ + mysql-test/std_data/*.cnf mysql-test/std_data/*.MY* \ $BASE/mysql-test/std_data $CP mysql-test/t/*.test $BASE/mysql-test/t $CP mysql-test/t/*.imtest mysql-test/t/*.disabled $BASE/mysql-test/t |