bzr push into mysql-trunk branch (mattias.jonsson:3836 to 3837)

[Mattias Jonsson]

 3837 Mattias Jonsson	2012-05-22
      WL4443:
      test/result fixes

    modified:
      mysql-test/extra/rpl_tests/rpl_auto_increment.test
      mysql-test/r/partition_pruning.result
 3836 Mattias Jonsson	2012-05-22
      WL4443:
      Verified that tbl->embedding must be checked in ::optimize(),
      and must not be checked in ::prepare().
      
      Added tests for const propagations (does not work for locks).
      
      Fixed rpl_auto_increment.test to avoid leaving files behind.

    modified:
      mysql-test/extra/rpl_tests/rpl_auto_increment.test
      mysql-test/r/partition_locking.result
      mysql-test/r/partition_pruning.result
      mysql-test/t/partition_locking.test
      sql/sql_optimizer.cc
      sql/sql_resolver.cc
=== modified file 'mysql-test/extra/rpl_tests/rpl_auto_increment.test'
--- a/mysql-test/extra/rpl_tests/rpl_auto_increment.test	revid:mattias.jonsson@stripped
+++ b/mysql-test/extra/rpl_tests/rpl_auto_increment.test	revid:mattias.jonsson@stripped
@@ -230,7 +230,6 @@ connection slave;
 source include/start_slave.inc;
 connection master;
 --exec $MYSQL_BINLOG $MYSQLD_DATADIR/master-bin.saved | $MYSQL test
---remove_file $MYSQLD_DATADIR/master-bin.saved;
 sync_slave_with_master;
 
 let $diff_tables= master:t1, slave:t1;

=== modified file 'mysql-test/r/partition_pruning.result'
--- a/mysql-test/r/partition_pruning.result	revid:mattias.jonsson@stripped
+++ b/mysql-test/r/partition_pruning.result	revid:mattias.jonsson@stripped
@@ -2884,7 +2884,7 @@ Variable_name	Value
 Handler_read_rnd_next	0
 show status like 'Handler_external_lock';
 Variable_name	Value
-Handler_external_lock	4
+Handler_external_lock	8
 explain extended delete t1,t2 from t1, t2 where t1.a=t2.a and t2.a=3;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	4	100.00	Using where
@@ -2900,7 +2900,7 @@ Variable_name	Value
 Handler_read_rnd_next	15
 show status like 'Handler_external_lock';
 Variable_name	Value
-Handler_external_lock	8
+Handler_external_lock	10
 select * from t1;
 a
 1

No bundle (reason: useless for push emails).