diff options
| author | unknown <tonu@x153.internalnet> | 2001-08-30 04:28:55 +0800 |
|---|---|---|
| committer | unknown <tonu@x153.internalnet> | 2001-08-30 04:28:55 +0800 |
| commit | 6b6483ef6fea275d27c8ea49f4d009e9cf6b181f (patch) | |
| tree | 6d44e8893ce2a3b240acc06d5c34bb41942392ce /sql/mysqld.cc | |
| parent | 9ec46a996c4cfa7f2528a29c43cda2d29ec35bc7 (diff) | |
| download | mariadb-git-6b6483ef6fea275d27c8ea49f4d009e9cf6b181f.tar.gz | |
OpenSSL work
readline/callback.c:
warning removed
sql/mysqld.cc:
Warning removed abut freeing zero pointer
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 4019046b87c..df3d30adfce 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -704,10 +704,10 @@ void clean_up(bool print_message) end_raid(); #endif #ifdef HAVE_OPENSSL - 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(opt_ssl_key,MYF(MY_ALLOW_ZERO_PTR)); + my_free(opt_ssl_cert,MYF(MY_ALLOW_ZERO_PTR)); + my_free(opt_ssl_ca,MYF(MY_ALLOW_ZERO_PTR)); + my_free(opt_ssl_capath,MYF(MY_ALLOW_ZERO_PTR)); opt_ssl_key=opt_ssl_cert=opt_ssl_ca=opt_ssl_capath=0; #endif /* HAVE_OPENSSL */ free_defaults(defaults_argv); |