diff options
| author | unknown <vvaintroub@wva.> | 2008-02-19 14:25:26 +0100 |
|---|---|---|
| committer | unknown <vvaintroub@wva.> | 2008-02-19 14:25:26 +0100 |
| commit | 8b91756be1b32102a37f492d97a2be8eb731377e (patch) | |
| tree | 4598dc5b0e7f63d98cfc1db8542104f7ca3bdacc | |
| parent | 13791914a55e943f359d8e1ba611cc0098586a36 (diff) | |
| download | mariadb-git-8b91756be1b32102a37f492d97a2be8eb731377e.tar.gz | |
Post-merge fix
| -rw-r--r-- | sql/sql_connect.cc | 19 | ||||
| -rw-r--r-- | sql/stacktrace.c | 2 |
2 files changed, 3 insertions, 18 deletions
diff --git a/sql/sql_connect.cc b/sql/sql_connect.cc index 309a1c7ab5d..c3541cb4eb4 100644 --- a/sql/sql_connect.cc +++ b/sql/sql_connect.cc @@ -39,22 +39,7 @@ #endif /* HAVE_OPENSSL */ #ifdef __WIN__ -static void test_signal(int sig_ptr) -{ -#if !defined( DBUG_OFF) - MessageBox(NULL,"Test signal","DBUG",MB_OK); -#endif -#if defined(OS2) - fprintf(stderr, "Test signal %d\n", sig_ptr); - fflush(stderr); -#endif -} -static void init_signals(void) -{ - int signals[7] = {SIGINT,SIGILL,SIGFPE,SIGSEGV,SIGTERM,SIGBREAK,SIGABRT } ; - for (int i=0 ; i < 7 ; i++) - signal( signals[i], test_signal) ; -} +extern void win_install_sigabrt_handler(); #endif /* @@ -626,7 +611,7 @@ bool init_new_connection_handler_thread() { pthread_detach_this_thread(); #if defined(__WIN__) - init_signals(); + win_install_sigabrt_handler(); #else /* Win32 calls this in pthread_create */ if (my_thread_init()) diff --git a/sql/stacktrace.c b/sql/stacktrace.c index 0186212900e..49e31fabd23 100644 --- a/sql/stacktrace.c +++ b/sql/stacktrace.c @@ -341,7 +341,7 @@ void set_exception_pointers(EXCEPTION_POINTERS *ep) #define SYMOPT_NO_PROMPTS 0 #endif -void print_stacktrace(gptr unused1, ulong unused2) +void print_stacktrace(uchar* unused1, ulong unused2) { HANDLE hProcess= GetCurrentProcess(); HANDLE hThread= GetCurrentThread(); |