Fixed shutdown problem on HPUX

Docs/manual.texi:
  Changelog
mysql-test/r/innodb.result:
  Update results after InnoDB optimizer changes.

1 files changed, 8 insertions, 1 deletions

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index c014f75fb84..c34f18da1ec 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -610,13 +610,20 @@ void kill_mysql(void)
   {
     DBUG_PRINT("error",("Got error %d from pthread_kill",errno)); /* purecov: inspected */
   }
-#else
+#elif !defined(SIGNALS_DONT_BREAK_READ)
   kill(current_pid,MYSQL_KILL_SIGNAL);
 #endif
   DBUG_PRINT("quit",("After pthread_kill"));
   shutdown_in_progress=1;			// Safety if kill didn't work
 #ifdef SIGNALS_DONT_BREAK_READ    
+  if (!abort_loop)
+  {
+    pthread_t tmp;
     abort_loop=1;
+    if (pthread_create(&tmp,&connection_attrib, kill_server_thread,
+			   (void*) 0))
+      sql_print_error("Error: Can't create thread to kill server");
+  }
 #endif    
   DBUG_VOID_RETURN;
 }