bzr commit into mysql-5.1 branch (Georgi.Kodinov:3638) Bug#12589928

[Georgi Kodinov]

#At file:///Users/kgeorge/mysql/work/B12589928-5.1/ based on revid:georgi.kodinov@stripped

 3638 Georgi Kodinov	2011-06-07
      Bug #12589928: MEMORY LEAK WHEN RUNNING SYS_VARS.SECURE_FILE_PRIV
      
      This is the 5.1 version of the fix.
            
      Need to free the memory allocated by the option parsing code for empty 
      strings when resetting the pointer to NULL.
      No test case needed, as the existing ones already cover this path.

    modified:
      sql/mysqld.cc
=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2011-06-06 10:13:54 +0000
+++ b/sql/mysqld.cc	2011-06-07 12:43:16 +0000
@@ -9063,6 +9063,7 @@ static int fix_paths(void)
   {
     if (*opt_secure_file_priv == 0)
     {
+      my_free(opt_secure_file_priv, MYF(0));
       opt_secure_file_priv= 0;
     }
     else


Attachment: [text/bzr-bundle] bzr/[e-mail]