Merge wva.:C:/bk/bug31745_2/my51_31754_2/..\my50-bug31745_2

into  wva.:C:/bk/bug31745_2/my51_31754_2


sql/CMakeLists.txt:
  Auto merged
sql/stacktrace.c:
  Auto merged
sql/sql_parse.cc:
  merge.
sql/mysqld.cc:
  merge
sql/stacktrace.h:
  merge

1 files changed, 18 insertions, 4 deletions

diff --git a/sql/stacktrace.h b/sql/stacktrace.h
index 1a0b80c88d3..74953f2e2af 100644
--- a/sql/stacktrace.h
+++ b/sql/stacktrace.h
@@ -28,19 +28,33 @@ extern char* heap_start;
 #define init_stacktrace() do {                                 \
                             heap_start = (char*) &__bss_start; \
                           } while(0);
+void check_thread_lib(void);
+#endif /* defined (__i386__) || (defined(__alpha__) && defined(__GNUC__))) */
+#elif defined (__WIN__)
+#define HAVE_STACKTRACE
+extern void set_exception_pointers(EXCEPTION_POINTERS *ep);
+#define init_stacktrace() {}
+#endif
+
+#ifdef HAVE_STACKTRACE
 void print_stacktrace(uchar* stack_bottom, ulong thread_stack);
 void safe_print_str(const char* name, const char* val, int max_len);
-#endif /* (defined (__i386__) || (defined(__alpha__) && defined(__GNUC__))) */
-#endif /* TARGET_OS_LINUX */
-
+#else
 /* Define empty prototypes for functions that are not implemented */
-#ifndef HAVE_STACKTRACE
 #define init_stacktrace() {}
 #define print_stacktrace(A,B) {}
 #define safe_print_str(A,B,C) {}
 #endif /* HAVE_STACKTRACE */
 
+
+#if !defined(__NETWARE__)
+#define HAVE_WRITE_CORE
+#endif
+
+#ifdef HAVE_WRITE_CORE
 void write_core(int sig);
+#endif
+
 
 #ifdef	__cplusplus
 }