database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Fix some libmysqld problems.

Browse Source
This commit is contained in:
tim@white.box
2001-08-21 19:04:31 -04:00
parent 1e1a1ec064
commit 2f190f67dc
4 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.bzrignore
View File

@ -392,3 +392,4 @@ tags
tmp/* tmp/*
vio/viotest-ssl vio/viotest-ssl
=6 =6
libmysqld/ha_innobase.cc

4
libmysqld/Makefile.am
View File

@ -40,7 +40,7 @@ libmysqlsources = errmsg.c get_password.c password.c
libmysqlobjects = errmsg.lo get_password.lo password.lo libmysqlobjects = errmsg.lo get_password.lo password.lo
sqlsources = convert.cc derror.cc field.cc field_conv.cc filesort.cc \ 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 \ ha_myisam.cc ha_myisammrg.cc handler.cc sql_handler.cc \
hostname.cc init.cc \ hostname.cc init.cc \
item.cc item_buff.cc item_cmpfunc.cc item_create.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 ## XXX: we should not have to duplicate info from the sources list
sqlobjects = convert.lo derror.lo field.lo field_conv.lo filesort.lo \ 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 \ ha_myisam.lo ha_myisammrg.lo handler.lo sql_handler.lo \
hostname.lo init.lo \ hostname.lo init.lo \
item.lo item_buff.lo item_cmpfunc.lo item_create.lo \ item.lo item_buff.lo item_cmpfunc.lo item_create.lo \

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"); sql_print_error("Can't create thread-keys");
exit(1); exit(1);
} }
// init_signals(); // Creates pidfile //init_signals();
//SWSOFT+ opt_noacl = 1;
opt_noacl = 1;
if (acl_init(opt_noacl)) if (acl_init(opt_noacl))
{ {
select_thread_in_use=0; select_thread_in_use=0;
@ -640,13 +639,14 @@ void mysql_server_end()
sql_print_error("After lock_thread_count"); sql_print_error("After lock_thread_count");
#endif #endif
/* Wait until cleanup is done */ // /* Wait until cleanup is done */
(void) pthread_mutex_lock(&LOCK_thread_count); // (void) pthread_mutex_lock(&LOCK_thread_count);
while (!ready_to_exit) // while (!ready_to_exit)
{ // {
pthread_cond_wait(&COND_thread_count,&LOCK_thread_count); // pthread_cond_wait(&COND_thread_count,&LOCK_thread_count);
} // }
(void) pthread_mutex_unlock(&LOCK_thread_count); // (void) pthread_mutex_unlock(&LOCK_thread_count);
unireg_end(0);
my_thread_end(); my_thread_end();
} }

5
sql/mini_client.cc
View File

@ -40,6 +40,11 @@
#include "mysqld_error.h" #include "mysqld_error.h"
#include "errmsg.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 ulong net_read_timeout;
extern "C" { // Because of SCO 3.2V4.2 extern "C" { // Because of SCO 3.2V4.2