bzr push into mysql-5.5 branch (Georgi.Kodinov:3477 to 3478)

[Georgi Kodinov]

 3478 Georgi Kodinov	2011-07-01 [merge]
      merge mysql-5.1->mysql-5.5

    modified:
      sql/mysqld.cc
 3477 Marko Mäkelä	2011-06-30 [merge]
      Merge mysql-5.1 to mysql-5.5.

    modified:
      mysql-test/suite/innodb/r/innodb-index.result
      mysql-test/suite/innodb/t/innodb-index.test
      storage/innobase/row/row0row.c
=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2011-06-06 10:24:28 +0000
+++ b/sql/mysqld.cc	2011-07-01 14:22:38 +0000
@@ -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

No bundle (reason: useless for push emails).