Commit a169482a authored by sasha@mysql.sashanet.com's avatar sasha@mysql.sashanet.com
Browse files

fixed bug in SSL code 

updated results - now ready to push
parent a71f818a

mysql-test/r/rpl000017.result

+1 −0
Original line number Diff line number Diff line 
reset master;

grant file on *.* to replicate@localhost identified by 'aaaaaaaaaaaaaaab';

grant file on *.* to replicate@127.0.0.1 identified by 'aaaaaaaaaaaaaaab';

slave start;

drop table if exists t1;

create table t1(n int);

mysql-test/r/type_enum.result

+1 −0

File changed.

Preview size limit exceeded, changes collapsed.

sql/mysqld.cc

+1 −1
Original line number Diff line number Diff line
@@ -2059,7 +2059,7 @@ The server will not act as a slave."); 
  }

#endif

#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 */

  /* Wait until cleanup is done */

  (void) pthread_mutex_lock(&LOCK_thread_count);