diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.am | 18 | ||||
| -rw-r--r-- | tools/mysqlmanager.c | 9 |
2 files changed, 13 insertions, 14 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index aa513c13f05..3c786dc9281 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,14 +1,10 @@ -INCLUDES = -I$(srcdir)/../include $(openssl_includes) \ - -I../include -I$(srcdir)/.. -I$(top_srcdir) \ - -I.. -LIBS = @TOOLS_LIBS@ $(openssl_libs) -LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysql_r/libmysqlclient_r.la -bin_PROGRAMS = mysqlmanager -mysqlmanager_SOURCES = mysqlmanager.c -mysqlmanager_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) -DEFS = -DUNDEF_THREADS_HACK +INCLUDES = @MT_INCLUDES@ -I$(srcdir)/../include \ + $(openssl_includes) -I../include +LDADD= @CLIENT_EXTRA_LDFLAGS@ ../libmysql_r/libmysqlclient_r.la @openssl_libs@ +bin_PROGRAMS= mysqlmanager +mysqlmanager_SOURCES= mysqlmanager.c +mysqlmanager_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) +DEF= -DUNDEF_THREADS_HACK # Don't update the files from bitkeeper %::SCCS/s.% - - diff --git a/tools/mysqlmanager.c b/tools/mysqlmanager.c index 4730ea8b043..8e6e8470cf3 100644 --- a/tools/mysqlmanager.c +++ b/tools/mysqlmanager.c @@ -928,6 +928,7 @@ static pthread_handler_decl(process_connection,arg) } manager_thd_free(thd); pthread_exit(0); + return 0; /* Don't get cc warning */ } static void client_msg_raw(Vio* vio, int err_code, int pre, const char* fmt, @@ -1175,13 +1176,15 @@ static int run_server_loop() { pthread_t th; struct manager_thd *thd; - int client_sock,len; + int client_sock; + uint len; Vio* vio; for (;!shutdown_requested;) { len=sizeof(struct sockaddr_in); - if ((client_sock=accept(manager_sock,(struct sockaddr*)&manager_addr,&len))<0) + if ((client_sock=accept(manager_sock,(struct sockaddr*)&manager_addr, + &len)) <0) { if (shutdown_requested) break; @@ -1569,7 +1572,7 @@ static int daemonize() int main(int argc, char** argv) { char c; - stack_bottom=&c; + stack_bottom= (uchar *) &c; MY_INIT(argv[0]); errfp = stderr; parse_args(argc,argv); |