diff options
| author | unknown <gluh@mysql.com/eagle.(none)> | 2007-02-01 18:00:24 +0400 |
|---|---|---|
| committer | unknown <gluh@mysql.com/eagle.(none)> | 2007-02-01 18:00:24 +0400 |
| commit | 2df292258636d678c1202140cffb75917af9a766 (patch) | |
| tree | 377c350f251e9ea221dc51f671e25b865691db6d /sql | |
| parent | fddf3c397913f3254bd2adf0d1d7ad4cde586355 (diff) | |
| download | mariadb-git-2df292258636d678c1202140cffb75917af9a766.tar.gz | |
Valgrind error fixes
Notes:
This patch doesn't fix all issues in the tree and we need jani's fix for that
This patch shoud not be merged into 5.0
mysql-test/r/ps.result:
result fix
mysql-test/r/symlink.result:
result fix
mysql-test/t/ps.test:
test is moved to 'symlink' test
mysql-test/t/symlink.test:
test from 'ps' test
sql/field_conv.cc:
valgrind error fix: backport from 5.0
sql/mysqld.cc:
release of ssl_context
vio/viosslfactories.c:
release of ssl_context
mysql-test/valgrind.supp:
New BitKeeper file ``mysql-test/valgrind.supp''
This file is backported from 5.0, added suppressing of OpenSSL errors
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/field_conv.cc | 4 | ||||
| -rw-r--r-- | sql/mysqld.cc | 3 |
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 d9962eec4c1..0cccf097132 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -1070,7 +1070,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(); |