database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge bk-internal.mysql.com:/home/bk/mysql-5.0

Browse Source 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge-41


sql/opt_range.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
mysql-test/Makefile.am:
  Manual merge.
This commit is contained in:
unknown
2006-07-11 08:36:50 +04:00
parent 7b659332e4 66fc547d1b
commit aedfd07248
16 changed files with 343 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/Makefile.am
View File

@ -101,15 +101,15 @@ uninstall-local:
@RM@ -f -r $(DESTDIR)$(testdir)
std_data/client-key.pem: $(top_srcdir)/SSL/$(@F)
@CP@ -f $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data
@RM@ -f $@; @CP@ $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data
std_data/client-cert.pem: $(top_srcdir)/SSL/$(@F)
@CP@ -f $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data
@RM@ -f $@; @CP@ $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data
std_data/cacert.pem: $(top_srcdir)/SSL/$(@F)
@CP@ -f $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data
@RM@ -f $@; @CP@ $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data
std_data/server-cert.pem: $(top_srcdir)/SSL/$(@F)
@CP@ -f $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data
@RM@ -f $@; @CP@ $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data
std_data/server-key.pem: $(top_srcdir)/SSL/$(@F)
@CP@ -f $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data
@RM@ -f $@; @CP@ $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data
SUFFIXES = .sh