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.

1 files changed, 10 insertions, 10 deletions

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();
 }