diff options
| author | unknown <bar@mysql.com> | 2005-03-29 17:24:26 +0500 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2005-03-29 17:24:26 +0500 |
| commit | 26ff24f0f7bba55f29e81d4fd9a923d96e669800 (patch) | |
| tree | ce2a7721b91b670467aa85de16245fb95e5ca459 /sql/mysqld.cc | |
| parent | bbd7265aa083ed0b78b3a2dae46bb7c1eb49becc (diff) | |
| parent | 0b45706c3bb5d855d1cc71cd8610a2d9c96e9547 (diff) | |
| download | mariadb-git-26ff24f0f7bba55f29e81d4fd9a923d96e669800.tar.gz | |
merge
mysys/charset-def.c:
Auto merged
BitKeeper/deleted/.del-errmsg.txt~f96b7055cac394e:
Auto merged
sql/mysqld.cc:
Auto merged
strings/ctype-big5.c:
Auto merged
strings/ctype-sjis.c:
Auto merged
strings/ctype-utf8.c:
Auto merged
mysql-test/r/type_blob.result:
after merge fix
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 31bf142c8ca..95de170b99d 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -4075,8 +4075,6 @@ errorconn: NullS); sql_perror(buff); } - my_security_attr_free(sa_event); - my_security_attr_free(sa_mapping); if (handle_client_file_map) CloseHandle(handle_client_file_map); if (handle_client_map) |