Commit 08aaa21b authored by miguel@hegel.local's avatar miguel@hegel.local

Merge miguel@work.mysql.com:/home/bk/mysql-4.0

into hegel.local:/home/miguel/dev/mysql-4.0
parents 9a2afb60 e2548b3f
...@@ -749,7 +749,7 @@ static void *kill_server(void *sig_ptr) ...@@ -749,7 +749,7 @@ static void *kill_server(void *sig_ptr)
#define RETURN_FROM_KILL_SERVER DBUG_RETURN(0) #define RETURN_FROM_KILL_SERVER DBUG_RETURN(0)
#else #else
static void __cdecl kill_server(int sig_ptr) static void __cdecl kill_server(int sig_ptr)
#define RETURN_FROM_KILL_SERVER DBUG_RETURN #define RETURN_FROM_KILL_SERVER DBUG_VOID_RETURN
#endif #endif
{ {
int sig=(int) (long) sig_ptr; // This is passed a int int sig=(int) (long) sig_ptr; // This is passed a int
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment