From 003d978acd505b3db36418f326782dc4ac55b9a7 Mon Sep 17 00:00:00 2001
From: unknown <tim@white.box>
Date: Tue, 21 Aug 2001 19:04:31 -0400
Subject: [PATCH] Fix some libmysqld problems.

BitKeeper/etc/ignore:
  Added libmysqld/ha_innobase.cc to the ignore list
libmysqld/Makefile.am:
  Add ha_innobase.cc to libmysqld.
libmysqld/lib_sql.cc:
  Hack to get shutdown working properly in libmysqld.  Probably
  this is not quite correct.
sql/mini_client.cc:
  Remove name collision in embedded libmysqld.
---
 .bzrignore            |  1 +
 libmysqld/Makefile.am |  4 ++--
 libmysqld/lib_sql.cc  | 20 ++++++++++----------
 sql/mini_client.cc    |  5 +++++
 4 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/.bzrignore b/.bzrignore
index 6660cfb86f7..08eb86adb8a 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -392,3 +392,4 @@ tags
 tmp/*
 vio/viotest-ssl
 =6
+libmysqld/ha_innobase.cc
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am
index 02d2d007b5d..aaa2b469ccb 100644
--- a/libmysqld/Makefile.am
+++ b/libmysqld/Makefile.am
@@ -40,7 +40,7 @@ libmysqlsources = errmsg.c get_password.c password.c
 libmysqlobjects = errmsg.lo get_password.lo password.lo
 
 sqlsources = convert.cc derror.cc field.cc field_conv.cc filesort.cc \
-	ha_berkeley.cc ha_heap.cc ha_isam.cc ha_isammrg.cc \
+	ha_innobase.cc ha_berkeley.cc ha_heap.cc ha_isam.cc ha_isammrg.cc \
 	ha_myisam.cc ha_myisammrg.cc handler.cc sql_handler.cc \
 	hostname.cc init.cc \
 	item.cc item_buff.cc item_cmpfunc.cc item_create.cc \
@@ -58,7 +58,7 @@ sqlsources = convert.cc derror.cc field.cc field_conv.cc filesort.cc \
 
 ## XXX: we should not have to duplicate info from the sources list
 sqlobjects = convert.lo derror.lo field.lo field_conv.lo filesort.lo \
-	ha_berkeley.lo ha_heap.lo ha_isam.lo ha_isammrg.lo \
+	ha_innobase.lo ha_berkeley.lo ha_heap.lo ha_isam.lo ha_isammrg.lo \
 	ha_myisam.lo ha_myisammrg.lo handler.lo sql_handler.lo \
 	hostname.lo init.lo \
 	item.lo item_buff.lo item_cmpfunc.lo item_create.lo \
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc
index e924c1da4c1..739f1fc7fe7 100644
--- a/libmysqld/lib_sql.cc
+++ b/libmysqld/lib_sql.cc
@@ -564,9 +564,8 @@ void mysql_server_init(int argc, char **argv, const char **groups)
     sql_print_error("Can't create thread-keys");
     exit(1);
   }
-//  init_signals();				// Creates pidfile
-//SWSOFT+
-	opt_noacl = 1;
+  //init_signals();
+  opt_noacl = 1;
   if (acl_init(opt_noacl))
   {
     select_thread_in_use=0;
@@ -640,13 +639,14 @@ void mysql_server_end()
   sql_print_error("After lock_thread_count");
 #endif
 
-  /* Wait until cleanup is done */
-  (void) pthread_mutex_lock(&LOCK_thread_count);
-  while (!ready_to_exit)
-  {
-    pthread_cond_wait(&COND_thread_count,&LOCK_thread_count);
-  }
-  (void) pthread_mutex_unlock(&LOCK_thread_count);
+//  /* Wait until cleanup is done */
+//  (void) pthread_mutex_lock(&LOCK_thread_count);
+//  while (!ready_to_exit)
+//  {
+//    pthread_cond_wait(&COND_thread_count,&LOCK_thread_count);
+//  }
+//  (void) pthread_mutex_unlock(&LOCK_thread_count);
+  unireg_end(0);
   my_thread_end();
 }
 
diff --git a/sql/mini_client.cc b/sql/mini_client.cc
index 261b1d03f78..d52dc40f6a8 100644
--- a/sql/mini_client.cc
+++ b/sql/mini_client.cc
@@ -40,6 +40,11 @@
 #include "mysqld_error.h"
 #include "errmsg.h"
 
+#ifdef EMBEDDED_LIBRARY
+#define net_read_timeout net_read_timeout1
+#define net_write_timeout net_write_timeout1
+#endif
+
 extern ulong net_read_timeout;
 
 extern "C" {					// Because of SCO 3.2V4.2