Commit 07cb4e93 authored by unknown's avatar unknown

fixed bug in SSL code

updated results - now ready to push


mysql-test/r/rpl000017.result:
  fix for new test format
mysql-test/r/type_enum.result:
  updated result
sql/mysqld.cc:
  fixed freeing NULL pointer
parent 89055361
reset master; reset master;
grant file on *.* to replicate@localhost identified by 'aaaaaaaaaaaaaaab'; grant file on *.* to replicate@localhost identified by 'aaaaaaaaaaaaaaab';
grant file on *.* to replicate@127.0.0.1 identified by 'aaaaaaaaaaaaaaab';
slave start; slave start;
drop table if exists t1; drop table if exists t1;
create table t1(n int); create table t1(n int);
......
This diff is collapsed.
...@@ -2059,7 +2059,7 @@ The server will not act as a slave."); ...@@ -2059,7 +2059,7 @@ The server will not act as a slave.");
} }
#endif #endif
#ifdef HAVE_OPENSSL #ifdef HAVE_OPENSSL
my_free((gptr)ssl_acceptor_fd,MYF(0)); my_free((gptr)ssl_acceptor_fd,MYF(MY_ALLOW_ZERO_PTR));
#endif /* HAVE_OPENSSL */ #endif /* HAVE_OPENSSL */
/* Wait until cleanup is done */ /* Wait until cleanup is done */
(void) pthread_mutex_lock(&LOCK_thread_count); (void) pthread_mutex_lock(&LOCK_thread_count);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment