Merge bk-internal.mysql.com:/home/bk/mysql-4.1

into  chilla.local:/home/mydev/mysql-4.1-axmrg


mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/symlink.test:
  Auto merged
sql/mysqld.cc:
  Auto merged

2 files changed, 7 insertions, 0 deletions

diff --git a/sql/field_conv.cc b/sql/field_conv.cc
index d61b3735c91..59b550572c3 100644
--- a/sql/field_conv.cc
+++ b/sql/field_conv.cc
@@ -605,6 +605,10 @@ void field_conv(Field *to,Field *from)
         from->charset() == to->charset() &&
 	to->table->db_low_byte_first == from->table->db_low_byte_first)
     {						// Identical fields
+#ifdef HAVE_purify
+      /* This may happen if one does 'UPDATE ... SET x=x' */
+      if (to->ptr != from->ptr)
+#endif
       memcpy(to->ptr,from->ptr,to->pack_length());
       return;
     }
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 5a80c7ad2f3..a3263b50951 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -1069,7 +1069,10 @@ void clean_up(bool print_message)
 #endif
 #ifdef HAVE_OPENSSL
   if (ssl_acceptor_fd)
+  {
+    SSL_CTX_free(ssl_acceptor_fd->ssl_context);
     my_free((gptr) ssl_acceptor_fd, MYF(MY_ALLOW_ZERO_PTR));
+  }
 #endif /* HAVE_OPENSSL */
 #ifdef USE_REGEX
   my_regex_end();