summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <lenz@mysql.com>2005-06-08 12:27:52 +0200
committerunknown <lenz@mysql.com>2005-06-08 12:27:52 +0200
commit5c6143b696f549dc28c72a7b1b3f7cad39fd458b (patch)
tree836d2d8a4eabb1ba1b1465389b9d9a7b1408e3f8
parentb5755ae60b2fac28f450edd64b1e98249d8660d8 (diff)
parentcaa903ef8344d67beb3fcd2e1e40e6e295c1f107 (diff)
downloadmariadb-git-5c6143b696f549dc28c72a7b1b3f7cad39fd458b.tar.gz
Merge mysql.com:/space/my/mysql-5.0.7-clone
into mysql.com:/space/my/mysql-5.0
-rw-r--r--mysql-test/Makefile.am1
-rw-r--r--scripts/make_binary_distribution.sh2
2 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am
index a5e3f7977ee..3cd1fb6f996 100644
--- a/mysql-test/Makefile.am
+++ b/mysql-test/Makefile.am
@@ -70,6 +70,7 @@ install-data-local:
$(DESTDIR)$(testdir)/lib
$(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(testdir)
$(INSTALL_DATA) $(srcdir)/t/*.test $(DESTDIR)$(testdir)/t
+ $(INSTALL_DATA) $(srcdir)/t/*.sql $(DESTDIR)$(testdir)/t
-$(INSTALL_DATA) $(srcdir)/t/*.disabled $(DESTDIR)$(testdir)/t
$(INSTALL_DATA) $(srcdir)/t/*.opt $(DESTDIR)$(testdir)/t
$(INSTALL_DATA) $(srcdir)/t/*.sh $(DESTDIR)$(testdir)/t
diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh
index 064c5e63f40..74734f4dd5f 100644
--- a/scripts/make_binary_distribution.sh
+++ b/scripts/make_binary_distribution.sh
@@ -226,7 +226,7 @@ $CP mysql-test/std_data/*.dat mysql-test/std_data/*.frm \
mysql-test/std_data/des_key_file mysql-test/std_data/*.*001 \
$BASE/mysql-test/std_data
$CP mysql-test/t/*.test mysql-test/t/*.disabled mysql-test/t/*.opt \
- mysql-test/t/*.slave-mi mysql-test/t/*.sh $BASE/mysql-test/t
+ mysql-test/t/*.slave-mi mysql-test/t/*.sh mysql-test/t/*.sql $BASE/mysql-test/t
$CP mysql-test/r/*.result mysql-test/r/*.require \
$BASE/mysql-test/r