bzr push into mysql-trunk branch (hemant.hk.kumar:3704 to 3705)

[Hemant Kumar]

 3705 Hemant Kumar	2012-04-20
      Added "rpl_binlog_n_mix_MTS" to mysql-trunk per push run.

    modified:
      mysql-test/collections/default.push
 3704 Vasil Dimov	2012-04-20
      Assert that a transaction which is being freed is not on
      trx->in_mysql_list.
      
      This assertion is added to help track down:
      
      Bug#13966453 CONCURRENT DML AND READS FROM I_S TABLES CRASH
        FETCH_DATA_INTO_CACHE_LOW
      Bug#13980608 CRASH OF SERVER IN THE TEST RQG_INFO_SCHEMA ON WIN
      
      but it should be there anyway, so it will be left even after the bugs
      are fixed.
      
      Suggested by:	Sunny

    modified:
      storage/innobase/trx/trx0trx.cc
=== modified file 'mysql-test/collections/default.push'
--- a/mysql-test/collections/default.push	2012-04-06 04:59:47 +0000
+++ b/mysql-test/collections/default.push	2012-04-20 09:38:11 +0000
@@ -3,4 +3,5 @@ perl mysql-test-run.pl --timer --force -
 perl mysql-test-run.pl --timer --force --parallel=auto --comment=main_embedded --vardir=var-main_emebbed  --suite=main --embedded --experimental=collections/default.experimental --skip-ndb
 perl mysql-test-run.pl --timer --force --parallel=auto --comment=innodb_4k_size --vardir=var-innodb-4k --experimental=collections/default.experimental --skip-ndb --suite=innodb --mysqld=--innodb-page-size=4k
 perl mysql-test-run.pl --timer --force --comment=explain-json --vardir=var-explain-json  --suite=explain_json_validate
-perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=partitions --vardir=var-parts      --suite=parts 
+perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=partitions --vardir=var-parts      --suite=parts
+perl mysql-test-run.pl --timer --force --parallel=auto --comment=rpl_binlog_n_mix_MTS --vardir=var-mts-rpl-binlog-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-ndb  --unit-tests --mysqld=--slave-parallel-workers=4 --mysqld=--slave-transaction-retries=0 --suite=rpl 

No bundle (reason: useless for push emails).