merge mysql-5.1->mysql-5.5

db95a75a · Georgi Kodinov · eaa2a0a9 · dd495796 · db95a75a
Commit db95a75a authored Jul 01, 2011 by Georgi Kodinov
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

sql/mysqld.cc sql/mysqld.cc +1 -0

No files found.
--- 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