diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-11-24 12:12:25 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-11-24 12:12:25 +0100 |
| commit | 87e3047501d74efd55983d6c45936f1bc3a13256 (patch) | |
| tree | 857a75fef3cd023ca835be3648bb195609b13cdb /scripts | |
| parent | de9980f4c61c3fdfe7547789ec4b0a86dc49c6a0 (diff) | |
| parent | 6bd194d7ca9942a5926fe98dd8f59bd5213f24fd (diff) | |
| download | mariadb-git-87e3047501d74efd55983d6c45936f1bc3a13256.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
mysql-test/Makefile.am:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/t/func_time.test:
Auto merged
sql-common/my_time.c:
Auto merged
sql/item_timefunc.cc:
Auto merged
mysql-test/mysql-test-run-shell.sh:
Auto merged
mysql-test/mysql-test-run.pl:
Manual merge of changes for RPM
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/make_binary_distribution.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh index f37e667dd86..6359eb009ce 100644 --- a/scripts/make_binary_distribution.sh +++ b/scripts/make_binary_distribution.sh @@ -224,6 +224,7 @@ $CP mysql-test/lib/*.pl $BASE/mysql-test/lib $CP mysql-test/lib/*.sql $BASE/mysql-test/lib $CP mysql-test/t/*.def $BASE/mysql-test/t $CP mysql-test/include/*.inc $BASE/mysql-test/include +$CP mysql-test/include/*.test $BASE/mysql-test/include $CP mysql-test/std_data/*.dat mysql-test/std_data/*.*001 \ mysql-test/std_data/*.cnf \ $BASE/mysql-test/std_data |