database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Fix some libmysqld problems.

Browse Source 
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.
This commit is contained in:
unknown
2001-08-21 19:04:31 -04:00
parent e3a9e7e40e
commit 003d978acd
4 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libmysqld/lib_sql.cc
View File

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