MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Horst Hunger Date:September 30 2009 1:17pm
Subject:bzr commit into mysql-5.4.5-next-mr branch (horst:2881) Bug#47739
View as plain text  
#At file:///work/bzr/mysql-47146/ based on revid:horst@stripped

 2881 Horst Hunger	2009-09-30
      Fix for Bug#47739. Dtrace was never executed with the Makefile.am and trying to load the plugin on Solaris with dtrace enabled failed. The changes now let dtrace make the probes_mysql.o and link it together with .libs/ha_archive_la-ha_archive.o (which is the right object) to the shared library.

    modified:
      storage/archive/Makefile.am
=== modified file 'storage/archive/Makefile.am'
--- a/storage/archive/Makefile.am	2009-03-18 10:04:15 +0000
+++ b/storage/archive/Makefile.am	2009-09-30 13:17:42 +0000
@@ -68,10 +68,10 @@ archive_reader_LDFLAGS = @NOINST_LDFLAGS
 EXTRA_DIST =		CMakeLists.txt plug.in
 
 if HAVE_DTRACE_DASH_G
-libarchive_a_LIBADD = probes_mysql.o
-libarchive_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers
-CLEANFILES = probes_mysql.o dtrace_files dtrace_providers
-DTRACEFILES = libarchive_a-ha_archive.o
+ha_archive_la_LIBADD = probes_mysql.o
+ha_archive_la_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers
+CLEANFILES = probes_mysql.o $(DTRACEPROVIDER) $(DTRACEFILES)
+DTRACEFILES = .libs/ha_archive_la-ha_archive.o
 DTRACEPROVIDER = probes_mysql.d
 
 dtrace_files:
@@ -81,7 +81,7 @@ dtrace_providers: probes_mysql.d
 probes_mysql.d:
 	-$(RM) -f probes_mysql.d
 	$(CP) $(top_srcdir)/include/probes_mysql.d.base probes_mysql.d
-	echo timestamp > dtrace_sources
+	date > dtrace_sources
 
 probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
 	$(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACEFILES) -o $@


Attachment: [text/bzr-bundle] bzr/horst@mysql.com-20090930131742-etj53i5h20kfd1q0.bundle
Thread
bzr commit into mysql-5.4.5-next-mr branch (horst:2881) Bug#47739Horst Hunger30 Sep
  • Re: bzr commit into mysql-5.4.5-next-mr branch (horst:2881) Bug#47739Joerg Bruehe30 Sep
    • Re: bzr commit into mysql-5.4.5-next-mr branch (horst:2881) Bug#47739horst hunger30 Sep
      • Re: bzr commit into mysql-5.4.5-next-mr branch (horst:2881) Bug#47739Joerg Bruehe30 Sep