Bug#19586917 - cannot build mysql with dtrace on solaris 11.2

phulakun · phulakun · commit 362fa6f68aa4 · 2014-10-07T15:39:51.000+05:30
On Solaris 11.2, "dtrace -V" output changed from "Sun D" to
"Oracle D". Because of this detection of real dtrace was failing.
Changed code in file dtrace.make to check "Sun D" or "Oracle D"
from "dtrace -V" output to fix this issue.
diff --git a/cmake/dtrace.cmake b/cmake/dtrace.cmake
@@ -43,10 +43,11 @@ MACRO(CHECK_DTRACE)
  EXECUTE_PROCESS(
    COMMAND ${DTRACE} -V
    OUTPUT_VARIABLE out)
- IF(out MATCHES "Sun D" AND
-    NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD" AND
-    NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
-   SET(HAVE_REAL_DTRACE_INSTRUMENTING ON CACHE BOOL "Real DTrace detected")
+ IF(out MATCHES "Sun D" OR out MATCHES "Oracle D")
+   IF(NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD" AND
+      NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
+     SET(HAVE_REAL_DTRACE_INSTRUMENTING ON CACHE BOOL "Real DTrace detected")
+   ENDIF()
  ENDIF()
  IF(HAVE_REAL_DTRACE_INSTRUMENTING)
    IF(CMAKE_SIZEOF_VOID_P EQUAL 4)
diff --git a/mysql-test/t/dynamic_tracing.test b/mysql-test/t/dynamic_tracing.test
@@ -23,7 +23,7 @@
   $ret = `dtrace -V 2>&1`;
   if ($? == 0)
   {
-    if ($ret =~ m/Sun D/)
+    if (($ret =~ m/Sun D/) || ($ret =~ m/Oracle D/))
     {
       $dyn_trace_tool_available = 1;
 

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	$ret = `dtrace -V 2>&1`;
`24`	`24`	`if ($? == 0)`
`25`	`25`	`{`
`26`		`- if ($ret =~ m/Sun D/)`
	`26`	`+ if (($ret =~ m/Sun D/) \|\| ($ret =~ m/Oracle D/))`
`27`	`27`	`{`
`28`	`28`	`$dyn_trace_tool_available = 1;`
`29`	`29`