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

Lots of portability fixes.

Browse Source 
Fixed shutdown on HPUX.
Fixed bug in query cache.
This commit is contained in:
monty@hundin.mysql.fi
2001-12-17 03:02:58 +02:00
parent fc3e066f36
commit 4dbd9e061c
22 changed files with 189 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tools/mysqlmanager.c
View File

@ -653,14 +653,14 @@ HANDLE_DECL(handle_stop_exec)
e->th=pthread_self();
if (!e->pid)
{
e->th=0;
/* e->th=0; */ /* th may be a struct */
pthread_mutex_unlock(&e->lock);
error="Process not running";
goto err;
}
if (mysql_shutdown(&e->mysql))
{
e->th=0;
/* e->th=0; */ /* th may be a struct */
pthread_mutex_unlock(&e->lock);
error="Could not send shutdown command";
goto err;
@ -669,7 +669,7 @@ HANDLE_DECL(handle_stop_exec)
pthread_cond_timedwait(&e->cond,&e->lock,&abstime);
if (e->pid)
error="Process failed to terminate within alotted time";
e->th=0;
/* e->th=0; */ /* th may be a struct */
pthread_mutex_unlock(&e->lock);
if (!error)
{
@ -1378,7 +1378,6 @@ static int run_server_loop()
pthread_t th;
struct manager_thd *thd;
int client_sock;
uint len;
Vio* vio;
pthread_attr_t thr_attr;
(void) pthread_attr_init(&thr_attr);
@ -1389,7 +1388,7 @@ static int run_server_loop()
for (;!shutdown_requested;)
{
len=sizeof(struct sockaddr_in);
size_socket len=sizeof(struct sockaddr_in);
if ((client_sock=accept(manager_sock,(struct sockaddr*)&manager_addr,
&len)) <0)
{