diff options
| author | monty@hundin.mysql.fi <> | 2001-08-13 17:59:40 +0300 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2001-08-13 17:59:40 +0300 |
| commit | cf19429793d1492af9c806132082e4f66b484fc1 (patch) | |
| tree | df01d4e8424454fc1871d80ce81a95cab8b0da49 /sql | |
| parent | 4a470fcc99eeed3811c1e8c3fa1a415ea6e37501 (diff) | |
| download | mariadb-git-cf19429793d1492af9c806132082e4f66b484fc1.tar.gz | |
Cleanups
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 26 | ||||
| -rw-r--r-- | sql/slave.cc | 4 |
2 files changed, 8 insertions, 22 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 77ee1890a42..5efeb59c17e 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -702,26 +702,12 @@ void clean_up(bool print_message) end_raid(); #endif #ifdef HAVE_OPENSSL - if(opt_ssl_key) { - my_free(opt_ssl_key,MYF(0)); - opt_ssl_key=0; - } - if(opt_ssl_cert) { - my_free(opt_ssl_cert,MYF(0)); - opt_ssl_cert=0; - } - if(opt_ssl_ca) { - my_free(opt_ssl_ca,MYF(0)); - opt_ssl_ca=0; - } - if(opt_ssl_capath) { - my_free(opt_ssl_capath,MYF(0)); - opt_ssl_capath=0; - } - if(ssl_acceptor_fd) { - my_free((gptr)ssl_acceptor_fd,MYF(0)); - ssl_acceptor_fd=0; - } + 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; #endif /* HAVE_OPENSSL */ free_defaults(defaults_argv); my_free(charsets_list, MYF(MY_ALLOW_ZERO_PTR)); diff --git a/sql/slave.cc b/sql/slave.cc index e5da79d6871..27637107b11 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -664,9 +664,9 @@ int show_master_info(THD* thd) net_store_data(packet, (longlong) glob_mi.pos); last_log_seq = glob_mi.last_log_seq; pthread_mutex_unlock(&glob_mi.lock); - pthread_mutex_lock(&LOCK_slave); + pthread_mutex_lock(&LOCK_slave); // QQ; This is not needed net_store_data(packet, slave_running ? "Yes":"No"); - pthread_mutex_unlock(&LOCK_slave); + pthread_mutex_unlock(&LOCK_slave); // QQ; This is not needed net_store_data(packet, &replicate_do_db); net_store_data(packet, &replicate_ignore_db); net_store_data(packet, (uint32)last_slave_errno); |