diff --git a/sql/stacktrace.c b/sql/stacktrace.c
index 4e6ad68c172..295a7a3e1e2 100644
--- a/sql/stacktrace.c
+++ b/sql/stacktrace.c
@@ -226,6 +226,25 @@ end:
 stack trace is much more helpful in diagnosing the problem, so please do \n\
 resolve it\n");
 }
+
+#elif defined(__sun)
+
+/* Use Solaris' symbolic stack trace routine. */
+#include <ucontext.h>
+
+void  print_stacktrace(gptr stack_bottom __attribute__((unused)), 
+                       ulong thread_stack __attribute__((unused)))
+{
+  if (printstack(fileno(stderr)) == -1)
+    fprintf(stderr, "Error when traversing the stack, stack appears corrupt.\n");
+  else
+    fprintf(stderr, "Please read "
+            "http://dev.mysql.com/doc/mysql/en/using-stack-trace.html "
+            "and follow instructions on how to resolve the stack trace. "
+            "Resolved\nstack trace is much more helpful in diagnosing the "
+            "problem, so please do \nresolve it\n");
+}
+
 #endif /* TARGET_OS_LINUX */
 #endif /* HAVE_STACKTRACE */
 
diff --git a/sql/stacktrace.h b/sql/stacktrace.h
index e5e17cc5b9b..718b545b775 100644
--- a/sql/stacktrace.h
+++ b/sql/stacktrace.h
@@ -35,6 +35,9 @@ void check_thread_lib(void);
 #define HAVE_STACKTRACE
 extern void set_exception_pointers(EXCEPTION_POINTERS *ep);
 #define init_stacktrace() {}
+#elif defined(__sun)
+#define HAVE_STACKTRACE
+#define init_stacktrace() {}
 #endif
 
 #ifdef HAVE_STACKTRACE