bzr push into mysql-trunk branch (Georgi.Kodinov:3246 to 3247) Bug#11757216

[Georgi Kodinov]

 3247 Georgi Kodinov	2011-07-08
      Addendum to bug #11757216: fix a test that expects SET DEFAULT_STORAGE_ENGINE to
      set default temp storage engine too.

    modified:
      mysql-test/include/mix1.inc
      mysql-test/suite/innodb/r/innodb_mysql.result
 3246 Marc Alff	2011-07-07
      Post merge cleanup, unit tests

    modified:
      storage/perfschema/unittest/pfs-t.cc
=== modified file 'mysql-test/include/mix1.inc'
--- a/mysql-test/include/mix1.inc	2011-03-30 13:33:29 +0000
+++ b/mysql-test/include/mix1.inc	2011-07-08 12:30:52 +0000
@@ -26,6 +26,7 @@
 #
 
 eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type;
+eval SET SESSION DEFAULT_TEMP_STORAGE_ENGINE = $engine_type;
 
 --disable_warnings
 drop table if exists t1,t2,t3,t1m,t1i,t2m,t2i,t4;

=== modified file 'mysql-test/suite/innodb/r/innodb_mysql.result'
--- a/mysql-test/suite/innodb/r/innodb_mysql.result	2011-07-05 05:01:29 +0000
+++ b/mysql-test/suite/innodb/r/innodb_mysql.result	2011-07-08 12:30:52 +0000
@@ -1,6 +1,7 @@
 set global innodb_support_xa=default;
 set session innodb_support_xa=default;
 SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB;
+SET SESSION DEFAULT_TEMP_STORAGE_ENGINE = InnoDB;
 drop table if exists t1,t2,t3,t1m,t1i,t2m,t2i,t4;
 drop procedure if exists p1;
 create table t1 (

No bundle (reason: useless for push emails).