Warning fixes

client/thread_test.c

@@ -19,7 +19,7 @@
 
 #ifndef THREAD
 
-int main(int argc, char **argv)
+int main(int argc __attribute__((unused)), char **argv __attribute__((unused)))
 {
   printf("This test must be compiled with multithread support to work\n");
   exit(1);

sql/mysqld.cc

@@ -703,12 +703,12 @@ void clean_up(bool print_message)
   end_raid();
 #endif
 #ifdef HAVE_OPENSSL
-  my_free(opt_ssl_key,MYF(MYF_ALLOW_ZERO_PTR));
-  my_free(opt_ssl_cert,MYF(MYF_ALLOW_ZERO_PTR));
-  my_free(opt_ssl_ca,MYF(MYF_ALLOW_ZERO_PTR));
-  my_free(opt_ssl_capath,MYF(MYF_ALLOW_ZERO_PTR));
-  my_free(opt_ssl_accceptor,MYF(MYF_ALLOW_ZERO_PTR));
-  opt_ssl_key=opt_ssl_cert=opt_ssl_ca=opt_ssl_capath=opt_ssl_acceptor=0;
+  my_free(opt_ssl_key,MYF(0));
+  my_free(opt_ssl_cert,MYF(0));
+  my_free(opt_ssl_ca,MYF(0));
+  my_free(opt_ssl_capath,MYF(0));
+//  my_free(ssl_acceptor_fd,MYF(0));
+  opt_ssl_key=opt_ssl_cert=opt_ssl_ca=opt_ssl_capath=0;
 #endif /* HAVE_OPENSSL */
   free_defaults(defaults_argv);
   my_free(charsets_list, MYF(MY_ALLOW_ZERO_PTR));

vio/Makefile.am

@@ -17,11 +17,17 @@
 INCLUDES =		-I$(srcdir)/../include -I../include $(openssl_includes)
 LDADD =			libvio.a $(openssl_libs) 
 pkglib_LIBRARIES =	libvio.a
-noinst_PROGRAMS	=	viotest-ssl
+noinst_PROGRAMS	=	test-ssl test-sslserver test-sslclient
 noinst_HEADERS =	
-viotest_ssl_SOURCES =   viotest-ssl.c
-viotest_ssl_LDADD =   	../dbug/libdbug.a libvio.a ../mysys/libmysys.a ../strings/libmystrings.a \
-			libvio.a $(openssl_libs)
+test_ssl_SOURCES =   test-ssl.c
+test_ssl_LDADD =   	../dbug/libdbug.a libvio.a ../mysys/libmysys.a \
+			../strings/libmystrings.a libvio.a $(openssl_libs)
+test_sslserver_SOURCES =   test-sslserver.c
+test_sslserver_LDADD =   	../dbug/libdbug.a libvio.a ../mysys/libmysys.a \
+			../strings/libmystrings.a libvio.a $(openssl_libs)
+test_sslclient_SOURCES =   test-sslclient.c
+test_sslclient_LDADD =   	../dbug/libdbug.a libvio.a ../mysys/libmysys.a \
+			../strings/libmystrings.a libvio.a $(openssl_libs)
 libvio_a_SOURCES =	vio.c viosocket.c viossl.c viosslfactories.c
 
 OMIT_DEPENDENCIES =	pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\