diff options
author | unknown <df@pippilotta.erinye.com> | 2007-07-20 09:20:48 +0200 |
---|---|---|
committer | unknown <df@pippilotta.erinye.com> | 2007-07-20 09:20:48 +0200 |
commit | d8305ab99be7c2fef0dc3a5a559ea2921d10ad84 (patch) | |
tree | e0924ee79fad727a35eba37b183cd2c91d7a478f /scripts | |
parent | 92de7b7bb284e69ddd638864edfa0ff1679e4f03 (diff) | |
parent | 77a0e7f718ecb414244530735f40c4a42e9e74bf (diff) | |
download | mariadb-git-d8305ab99be7c2fef0dc3a5a559ea2921d10ad84.tar.gz |
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0.46
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
configure.in:
Auto merged
libmysql/libmysql.c:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/field.cc:
Auto merged
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 94b4019cd1e..9584721682f 100644 --- a/scripts/make_binary_distribution.sh +++ b/scripts/make_binary_distribution.sh @@ -296,6 +296,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/*.MYD mysql-test/std_data/*.MYI \ mysql-test/std_data/*.pem mysql-test/std_data/Moscow_leap \ + mysql-test/std_data/Index.xml \ mysql-test/std_data/des_key_file mysql-test/std_data/*.*001 \ mysql-test/std_data/*.cnf mysql-test/std_data/*.MY* \ $BASE/mysql-test/std_data |