summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjimw@mysql.com <>2005-04-05 13:01:42 -0700
committerjimw@mysql.com <>2005-04-05 13:01:42 -0700
commit127afff8c87cf8d6a56de799a6b7d5ad2a20d5bd (patch)
tree094ac5d34f6c7c9798149241eaea3180d2d96c81
parenta12f66251b85147d026fe0f786496a97032b2cd2 (diff)
downloadmariadb-git-127afff8c87cf8d6a56de799a6b7d5ad2a20d5bd.tar.gz
Remove references to result.es files
-rw-r--r--mysql-test/Makefile.am3
-rw-r--r--scripts/make_binary_distribution.sh2
2 files changed, 2 insertions, 3 deletions
diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am
index 294c135bcf3..1325b90631f 100644
--- a/mysql-test/Makefile.am
+++ b/mysql-test/Makefile.am
@@ -51,7 +51,7 @@ dist-hook:
-$(INSTALL_DATA) $(srcdir)/t/*.disabled $(distdir)/t
$(INSTALL_DATA) $(srcdir)/t/*.opt $(srcdir)/t/*.sh $(srcdir)/t/*.slave-mi $(distdir)/t
$(INSTALL_DATA) $(srcdir)/include/*.inc $(distdir)/include
- $(INSTALL_DATA) $(srcdir)/r/*.result $(srcdir)/r/*.result.es $(srcdir)/r/*.require $(distdir)/r
+ $(INSTALL_DATA) $(srcdir)/r/*.result $(srcdir)/r/*.require $(distdir)/r
$(INSTALL_DATA) $(srcdir)/std_data/Moscow_leap $(distdir)/std_data
$(INSTALL_DATA) $(srcdir)/std_data/*.dat $(srcdir)/std_data/*.000001 $(distdir)/std_data
$(INSTALL_DATA) $(srcdir)/std_data/des_key_file $(distdir)/std_data
@@ -71,7 +71,6 @@ install-data-local:
$(INSTALL_DATA) $(srcdir)/t/*.sh $(DESTDIR)$(testdir)/t
$(INSTALL_DATA) $(srcdir)/t/*.slave-mi $(DESTDIR)$(testdir)/t
$(INSTALL_DATA) $(srcdir)/r/*.result $(DESTDIR)$(testdir)/r
- $(INSTALL_DATA) $(srcdir)/r/*.result.es $(DESTDIR)$(testdir)/r
$(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
diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh
index 6ebe05fe116..a1c380780b0 100644
--- a/scripts/make_binary_distribution.sh
+++ b/scripts/make_binary_distribution.sh
@@ -225,7 +225,7 @@ $CP mysql-test/std_data/*.dat mysql-test/std_data/*.frm \
$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
-$CP mysql-test/r/*.result mysql-test/r/*.result.es mysql-test/r/*.require \
+$CP mysql-test/r/*.result mysql-test/r/*.require \
$BASE/mysql-test/r
if [ $BASE_SYSTEM != "netware" ] ; then