diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-07-01 17:22:38 +0300 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-07-01 17:22:38 +0300 |
| commit | bc9f870fb12d4aedc6239ec485dee6ebc23d9b94 (patch) | |
| tree | 2c81e1a77d7f97bbf216097feaf86c1f0f38cbb2 /sql | |
| parent | 13520f4ae5b4950b6bb65f7a0070ff9b6ac4124d (diff) | |
| parent | 8e14d52610d747977bcbe2875cbe7d93724d8143 (diff) | |
| download | mariadb-git-bc9f870fb12d4aedc6239ec485dee6ebc23d9b94.tar.gz | |
merge mysql-5.1->mysql-5.5
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 98562b08a0b..4de27e2bfbe 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -7633,6 +7633,7 @@ static int fix_paths(void) { if (*opt_secure_file_priv == 0) { + my_free(opt_secure_file_priv); opt_secure_file_priv= 0; } else |