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

into hegel.local:/home/miguel/dev/mysql-4.0

Merge miguel@work.mysql.com:/home/bk/mysql-4.0
into hegel.local:/home/miguel/dev/mysql-4.0
6878f548 · unknown · 0ae9e6e8 · f20d079b · 6878f548
Commit 6878f548 authored Jan 16, 2003 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/mysqld.cc sql/mysqld.cc +1 -1

No files found.
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -749,7 +749,7 @@ static void *kill_server(void *sig_ptr)
 #define RETURN_FROM_KILL_SERVER DBUG_RETURN(0)
 #else
 static void __cdecl kill_server(int sig_ptr)
-#define RETURN_FROM_KILL_SERVER DBUG_RETURN
+#define RETURN_FROM_KILL_SERVER DBUG_VOID_RETURN
 #endif
 {
  int sig=(int) (long) sig_ptr;			// This is passed a int