From 905ce89dc53596303dd9cbf31b24002e49b5cbab Mon Sep 17 00:00:00 2001
From: "lenz@mysql.com" <>
Date: Tue, 4 Mar 2003 18:18:05 +0100
Subject: [PATCH]  - added missing file mysql-test/std_data/des_key_file to
 source and binary    distribution to fix a test failure in test
 "func_encrypt"

---
 mysql-test/Makefile.am              | 2 ++
 scripts/make_binary_distribution.sh | 1 +
 2 files changed, 3 insertions(+)

diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am
index 06897852f17..66f931133e3 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/*.001 $(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 78eb1343f47..f0113ee1780 100644
--- a/scripts/make_binary_distribution.sh
+++ b/scripts/make_binary_distribution.sh
@@ -183,6 +183,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