diff options
| author | evgen@moonbone.local <> | 2006-08-02 16:46:55 +0400 |
|---|---|---|
| committer | evgen@moonbone.local <> | 2006-08-02 16:46:55 +0400 |
| commit | 7f0a080660f6e3b75e395b61b00b6dce50b22ccb (patch) | |
| tree | acb2670164a1b5cec9a775f963d19c2329e446fd /mysql-test | |
| parent | 67c85a170a92d7d0620facf04b38210f22caab7e (diff) | |
| parent | cac5ad03b91bbf359db5d53999b32426bffc79b0 (diff) | |
| download | mariadb-git-7f0a080660f6e3b75e395b61b00b6dce50b22ccb.tar.gz | |
Merge moonbone.local:/work/tmp_merge-4.1-opt-mysql
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index 39fc425bf06..11bcef10fff 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -89,6 +89,7 @@ install-data-local: $(INSTALL_DATA) $(srcdir)/include/*.inc $(DESTDIR)$(testdir)/include $(INSTALL_DATA) $(srcdir)/std_data/*.dat $(DESTDIR)$(testdir)/std_data $(INSTALL_DATA) $(srcdir)/std_data/*.*001 $(DESTDIR)$(testdir)/std_data + $(INSTALL_DATA) $(srcdir)/std_data/*.cnf $(DESTDIR)$(testdir)/std_data $(INSTALL_DATA) $(srcdir)/std_data/des_key_file $(DESTDIR)$(testdir)/std_data $(INSTALL_DATA) $(srcdir)/std_data/Moscow_leap $(DESTDIR)$(testdir)/std_data $(INSTALL_DATA) $(srcdir)/std_data/*.pem $(DESTDIR)$(testdir)/std_data |