1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Post-merge fix

Browse Source
This commit is contained in:
unknown 2008-02-19 14:25:26 +01:00
parent 13791914a5
commit 8b91756be1
2 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sql/sql_connect.cc
View File

@ -39,22 +39,7 @@
#endif /* HAVE_OPENSSL */ #endif /* HAVE_OPENSSL */
#ifdef __WIN__ #ifdef __WIN__
static void test_signal(int sig_ptr) extern void win_install_sigabrt_handler();
{
#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) ;
}
#endif #endif
/* /*
@ -626,7 +611,7 @@ bool init_new_connection_handler_thread()
{ {
pthread_detach_this_thread(); pthread_detach_this_thread();
#if defined(__WIN__) #if defined(__WIN__)
init_signals(); win_install_sigabrt_handler();
#else #else
/* Win32 calls this in pthread_create */ /* Win32 calls this in pthread_create */
if (my_thread_init()) if (my_thread_init())

2
sql/stacktrace.c
View File

@ -341,7 +341,7 @@ void set_exception_pointers(EXCEPTION_POINTERS *ep)
#define SYMOPT_NO_PROMPTS 0 #define SYMOPT_NO_PROMPTS 0
#endif #endif
void print_stacktrace(gptr unused1, ulong unused2) void print_stacktrace(uchar* unused1, ulong unused2)
{ {
HANDLE hProcess= GetCurrentProcess(); HANDLE hProcess= GetCurrentProcess();
HANDLE hThread= GetCurrentThread(); HANDLE hThread= GetCurrentThread();