bzr push into mysql-5.1 branch (Georgi.Kodinov:3662 to 3663) Bug#12589928

[Georgi Kodinov]

 3663 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
 3662 Marko Mäkelä	2011-06-30
      Bug#12637786 Wrong secondary index entries on CHAR and VARCHAR columns
      
      row_build_index_entry(): In innodb_file_format=Barracuda
      (ROW_FORMAT=DYNAMIC or ROW_FORMAT=COMPRESSED), a secondary index on a
      full column can refer to a field that is stored off-page in the
      clustered index record. Take that into account.
      
      rb:692 approved by Jimmy Yang

    modified:
      mysql-test/suite/innodb_plugin/r/innodb-index.result
      mysql-test/suite/innodb_plugin/t/innodb-index.test
      storage/innodb_plugin/ChangeLog
      storage/innodb_plugin/row/row0row.c
=== 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

No bundle (reason: useless for push emails).