summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2001-12-17 03:02:58 +0200
committerunknown <monty@hundin.mysql.fi>2001-12-17 03:02:58 +0200
commit3ca9e15c3b6d89756b63afdaf450f2380b162c33 (patch)
tree941257314e6e021bd649a4b42156be700895e6a0 /tools
parent9cf75151d1c5746e160f61935b47b19693d44800 (diff)
downloadmariadb-git-3ca9e15c3b6d89756b63afdaf450f2380b162c33.tar.gz
Lots of portability fixes.
Fixed shutdown on HPUX. Fixed bug in query cache. Docs/manual.texi: Changelog configure.in: Fixes for HPUX include/m_string.h: Fixes for Purify include/my_pthread.h: Fixes for HPUX include/raid.h: Portability fix. innobase/include/univ.i: Portability fix. mysql-test/mysql-test-run.sh: Added --manual-gdb mysql-test/r/rpl_log.result: Portability fix mysql-test/t/rpl_log.test: Portability fix mysys/my_pthread.c: Portability fix (HPUX) mysys/raid.cc: Portability fix mysys/thr_mutex.c: Portability fix scripts/mysql_install_db.sh: Clean up install message sql-bench/test-alter-table.sh: Fix testsuite sql/ha_innobase.cc: Fixed stack overwrite. sql/log_event.cc: Fixed purify warning sql/mysqld.cc: Added patch from FreeBSD port. Fixed shutdown on HPUX. sql/slave.cc: Cleanup sql/sql_cache.cc: Binary search in 'step' searching Check maximal block in bin Limit of comparasions number in list of memory blocks. Fixed bug in pack() sql/sql_cache.h: Binary search in 'step' searching Check maximal block in bin Limit of comparasions number in list of memory blocks. Fixed bug in pack() sql/sql_parse.cc: Optimize tools/mysqlmanager.c: Portability fix
Diffstat (limited to 'tools')
-rw-r--r--tools/mysqlmanager.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/tools/mysqlmanager.c b/tools/mysqlmanager.c
index 5130838c99e..c8b7803790c 100644
--- a/tools/mysqlmanager.c
+++ b/tools/mysqlmanager.c
@@ -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)
{