diff options
| author | lenz@mysql.com <> | 2005-02-09 17:52:31 +0100 |
|---|---|---|
| committer | lenz@mysql.com <> | 2005-02-09 17:52:31 +0100 |
| commit | 420d29159f381dc02f5ef27ecf7d65e128a1ee96 (patch) | |
| tree | 400e3f4cf2afd743f9e08045735da256d5bb3e05 /mysql-test | |
| parent | 9a564f832ad454c8e51b058bb982c90e85f9936e (diff) | |
| parent | a0089319d2bbe21f761df2982e26c89ff9d53a60 (diff) | |
| download | mariadb-git-420d29159f381dc02f5ef27ecf7d65e128a1ee96.tar.gz | |
Merge mysql.com:/space/my/mysql-4.1-merge
into mysql.com:/space/my/mysql-5.0
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index 3d5833c47be..8735c4c1fff 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -47,7 +47,7 @@ dist-hook: $(distdir)/std_data $(INSTALL_DATA) $(srcdir)/t/*.test $(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/*.require $(distdir)/r + $(INSTALL_DATA) $(srcdir)/r/*.result $(srcdir)/r/*.result.es $(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 @@ -65,7 +65,7 @@ install-data-local: $(INSTALL_DATA) $(srcdir)/t/*.opt $(DESTDIR)$(testdir)/t $(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 $(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 |