bk commit into 5.0 tree (msvensson:1.2479)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-05-11 14:23:19+02:00, msvensson@stripped +1 -0
  Move print_signal_warning to scopt of where it's used i.e 
  it will be ifdefed out when not used.

  sql/mysqld.cc@stripped, 2007-05-11 14:23:18+02:00, msvensson@stripped +18 -16
    Move print_signal_warning to scopt of where it's used i.e 
    it will be ifdefed out when not used.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	pilot.blaudden
# Root:	/home/msvensson/mysql/mysql-5.0-maint

--- 1.609/sql/mysqld.cc	2007-05-02 14:25:09 +02:00
+++ 1.610/sql/mysqld.cc	2007-05-11 14:23:18 +02:00
@@ -1042,22 +1042,6 @@ pthread_handler_t kill_server_thread(voi
 }
 #endif
 
-extern "C" sig_handler print_signal_warning(int sig)
-{
-  if (!DBUG_IN_USE)
-  {
-    if (global_system_variables.log_warnings)
-      sql_print_warning("Got signal %d from thread %ld",
-                        sig, my_thread_id());
-  }
-#ifdef DONT_REMEMBER_SIGNAL
-  my_sigset(sig,print_signal_warning);		/* int. thread system calls */
-#endif
-#if !defined(__WIN__) && !defined(OS2) && !defined(__NETWARE__)
-  if (sig == SIGALRM)
-    alarm(2);					/* reschedule alarm */
-#endif
-}
 
 /*
   cleanup all memory and end program nicely
@@ -2176,6 +2160,24 @@ bugs.\n");
 #endif
 
 #ifndef EMBEDDED_LIBRARY
+
+extern "C" sig_handler print_signal_warning(int sig)
+{
+  if (!DBUG_IN_USE)
+  {
+    if (global_system_variables.log_warnings)
+      sql_print_warning("Got signal %d from thread %ld",
+                        sig, my_thread_id());
+  }
+#ifdef DONT_REMEMBER_SIGNAL
+  my_sigset(sig,print_signal_warning);		/* int. thread system calls */
+#endif
+#if !defined(__WIN__) && !defined(OS2) && !defined(__NETWARE__)
+  if (sig == SIGALRM)
+    alarm(2);					/* reschedule alarm */
+#endif
+}
+
 
 static void init_signals(void)
 {