bzr push into mysql-trunk branch (mattias.jonsson:3760 to 3761) Bug#13559657

[Mattias Jonsson]

 3761 Mattias Jonsson	2012-01-21
      post-push fix of Bug#13559657.
      
      main.partition_explicit_prune fails on embedded builds
      due to different default engine (MyISAM instead of InnoDB).
      
      Fixed by setting the engine to InnoDB.

    modified:
      mysql-test/r/partition_explicit_prune.result
      mysql-test/t/partition_explicit_prune.test
 3760 Christopher Powers	2012-01-20
      Bug#13440472 - MANY VALGRIND FAILURES ON DAILY-TRUNK
        
      Disable inline optimizations for valgrind builds to avoid false positives.

    modified:
      cmake/build_configurations/mysql_release.cmake
=== modified file 'mysql-test/r/partition_explicit_prune.result'
--- a/mysql-test/r/partition_explicit_prune.result	revid:chris.powers@stripped
+++ b/mysql-test/r/partition_explicit_prune.result	revid:mattias.jonsson@stripped
@@ -1,7 +1,9 @@
 #
 # Bug#13559657: PARTITION SELECTION DOES NOT WORK WITH VIEWS
 #
-CREATE TABLE t1 (a int) PARTITION BY HASH (a) PARTITIONS 2;
+CREATE TABLE t1 (a int)
+ENGINE = InnoDB
+PARTITION BY HASH (a) PARTITIONS 2;
 INSERT INTO t1 VALUES (0), (1), (2), (3);
 CREATE VIEW v1 AS SELECT a FROM t1 PARTITION (p0);
 SHOW CREATE VIEW v1;

=== modified file 'mysql-test/t/partition_explicit_prune.test'
--- a/mysql-test/t/partition_explicit_prune.test	revid:chris.powers@stripped
+++ b/mysql-test/t/partition_explicit_prune.test	revid:mattias.jonsson@stripped
@@ -8,7 +8,9 @@ WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND
 --echo #
 --echo # Bug#13559657: PARTITION SELECTION DOES NOT WORK WITH VIEWS
 --echo #
-CREATE TABLE t1 (a int) PARTITION BY HASH (a) PARTITIONS 2;
+CREATE TABLE t1 (a int)
+ENGINE = InnoDB
+PARTITION BY HASH (a) PARTITIONS 2;
 INSERT INTO t1 VALUES (0), (1), (2), (3);
 CREATE VIEW v1 AS SELECT a FROM t1 PARTITION (p0);
 SHOW CREATE VIEW v1;

No bundle (reason: useless for push emails).