bzr push into mysql-trunk branch (Georgi.Kodinov:3253 to 3254)

[Georgi Kodinov]

 3254 Georgi Kodinov	2011-07-01 [merge]
      merge mysql-5.5->mysql-trunk

    modified:
      sql/mysqld.cc
 3253 Georgi Kodinov	2011-06-21
      BUG# 11757216: 49232: --STORAGE-ENGINE SHOULD BE DECOUPLED FROM 
      DEFAULT TEMPTABLE TYPE
      
      Implemented a --default-temp-storage_engine variable to complement the 
      --default-storage-engine.
      It's default value is the same as of --default-storage-engine.
      But it's totally independent from --default-storage-engine.
      The value of --default-temp-storage-engine affects only the tables created 
      by CREATE TEMPORARY TABLE. All other internally created temp tables are not 
      affected by it.
      The special storage engine name "DEFAULT", when applied to such temporary
      tables work as an alias of the default temp table storage engine.
      Extended mysql-test-run.pl to issue --default-temp-storage-engine=myisam
      as a complement to --default-storage-engine=myisam.
      
      Test case added. 
      Affected test cases updated.

    added:
      mysql-test/suite/sys_vars/r/default_temp_storage_engine_basic.result
      mysql-test/suite/sys_vars/t/default_temp_storage_engine_basic.test
    modified:
      mysql-test/lib/mtr_cases.pm
      mysql-test/mysql-test-run.pl
      mysql-test/r/mysqld--help-notwin.result
      mysql-test/r/mysqld--help-win.result
      mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam-master.opt
      mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam-master.opt
      mysql-test/t/bootstrap-master.opt
      mysql-test/t/bootstrap.test
      mysql-test/t/ctype_utf8mb4-master.opt
      sql/handler.cc
      sql/handler.h
      sql/mysqld.cc
      sql/mysqld.h
      sql/sql_class.h
      sql/sql_plugin.cc
      sql/sql_table.cc
      sql/sql_yacc.yy
      sql/sys_vars.cc
      sql/sys_vars.h
      sql/table.cc
=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2011-06-21 10:05:48 +0000
+++ b/sql/mysqld.cc	2011-07-01 14:32:36 +0000
@@ -8059,6 +8059,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).