diff options
| author | unknown <evgen@moonbone.local> | 2006-08-02 16:46:55 +0400 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2006-08-02 16:46:55 +0400 |
| commit | 0825bad93aaeaa64a907250263146adef8187405 (patch) | |
| tree | acb2670164a1b5cec9a775f963d19c2329e446fd /mysql-test/Makefile.am | |
| parent | c102fe94adf39b2ed472794e0a8c72d16ddbeb74 (diff) | |
| parent | 328e8c74308fbd73236a324c30a64fb3f9d9c672 (diff) | |
| download | mariadb-git-0825bad93aaeaa64a907250263146adef8187405.tar.gz | |
Merge moonbone.local:/work/tmp_merge-4.1-opt-mysql
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
mysql-test/Makefile.am:
Auto merged
scripts/make_win_src_distribution.sh:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
client/mysqltest.c:
Manual merge
Diffstat (limited to 'mysql-test/Makefile.am')
| -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 |