summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <lenz@mysql.com>2003-03-04 22:24:00 +0100
committerunknown <lenz@mysql.com>2003-03-04 22:24:00 +0100
commitd92ba55e1d6a9f945350a7630c262fd80be97544 (patch)
treec000ba3bdcc84024fa1f425fa355a341ee145dd4
parentd8d2d68d6afaed234b4bf2887a08df44a2995cdd (diff)
downloadmariadb-git-d92ba55e1d6a9f945350a7630c262fd80be97544.tar.gz
- added missing file mysql-test/std_data/des_key_file to source and binary
distribution to fix a test failure in test "func_encrypt"
-rw-r--r--mysql-test/Makefile.am2
-rw-r--r--scripts/make_binary_distribution.sh1
2 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am
index 9f0936b1264..6c53e7949c7 100644
--- a/mysql-test/Makefile.am
+++ b/mysql-test/Makefile.am
@@ -31,6 +31,7 @@ dist-hook:
$(INSTALL_DATA) $(srcdir)/include/*.inc $(distdir)/include
$(INSTALL_DATA) $(srcdir)/r/*.result $(srcdir)/r/*.require $(distdir)/r
$(INSTALL_DATA) $(srcdir)/std_data/*.dat $(srcdir)/std_data/*.000001 $(distdir)/std_data
+ $(INSTALL_DATA) $(srcdir)/std_data/des_key_file $(distdir)/std_data
install-data-local:
$(mkinstalldirs) \
@@ -47,6 +48,7 @@ install-data-local:
$(INSTALL_DATA) $(srcdir)/r/*.require $(DESTDIR)$(testdir)/r
$(INSTALL_DATA) $(srcdir)/include/*.inc $(DESTDIR)$(testdir)/include
$(INSTALL_DATA) $(srcdir)/std_data/*.dat $(DESTDIR)$(testdir)/std_data
+ $(INSTALL_DATA) $(srcdir)/std_data/des_key_file $(DESTDIR)$(testdir)/std_data
SUFFIXES = .sh
diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh
index 874896c33b4..2fff531c4c8 100644
--- a/scripts/make_binary_distribution.sh
+++ b/scripts/make_binary_distribution.sh
@@ -184,6 +184,7 @@ done
$CP mysql-test/include/*.inc $BASE/mysql-test/include
$CP mysql-test/std_data/*.dat mysql-test/std_data/*.001 $BASE/mysql-test/std_data
+$CP mysql-test/std_data/des_key_file $BASE/mysql-test/std_data
$CP mysql-test/t/*test mysql-test/t/*.opt mysql-test/t/*.slave-mi mysql-test/t/*.sh $BASE/mysql-test/t
$CP mysql-test/r/*result mysql-test/r/*.require $BASE/mysql-test/r