diff options
| author | tonu@x153.internalnet <> | 2001-08-23 03:05:56 +0800 |
|---|---|---|
| committer | tonu@x153.internalnet <> | 2001-08-23 03:05:56 +0800 |
| commit | b4815e5ec736832fd169918f1ccab83ac0a27f79 (patch) | |
| tree | 5f5f8dee702080b60bfaf5d38339d4539a5b0c74 | |
| parent | 66b4a894dd0bb3a3dd4ce3dd646329bb0361cc56 (diff) | |
| download | mariadb-git-b4815e5ec736832fd169918f1ccab83ac0a27f79.tar.gz | |
Warning fixes
| -rw-r--r-- | client/thread_test.c | 2 | ||||
| -rw-r--r-- | sql/mysqld.cc | 12 | ||||
| -rw-r--r-- | vio/Makefile.am | 14 |
3 files changed, 17 insertions, 11 deletions
diff --git a/client/thread_test.c b/client/thread_test.c index 4d3ae6e7ddd..41adb23c408 100644 --- a/client/thread_test.c +++ b/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); diff --git a/sql/mysqld.cc b/sql/mysqld.cc index c719da38961..a036c885f4b 100644 --- a/sql/mysqld.cc +++ b/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)); diff --git a/vio/Makefile.am b/vio/Makefile.am index e8b226adb37..7119c278862 100644 --- a/vio/Makefile.am +++ b/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\ |