bzr push into mysql-trunk branch (vasil.dimov:3938 to 3939)

[vasil.dimov]

 3939 Vasil Dimov	2012-02-21 [merge]
      Merge mysql-5.5 -> mysql-trunk

    modified:
      mysql-test/suite/innodb/t/innodb_bug34300.test
 3938 Mattias Jonsson	2012-02-21 [merge]
      Merge of bug#12750920 into mysql-trunk

    added:
      mysql-test/r/mysql_client_test_embedded.result
      mysql-test/t/mysql_client_test_embedded.cnf
      mysql-test/t/mysql_client_test_embedded.test
    modified:
      sql/mysqld.cc
      sql/rpl_handler.cc
      sql/sql_show.cc
      sql/sys_vars.cc
      tests/mysql_client_test.c
=== modified file 'mysql-test/suite/innodb/t/innodb_bug34300.test'
--- a/mysql-test/suite/innodb/t/innodb_bug34300.test	revid:mattias.jonsson@stripped
+++ b/mysql-test/suite/innodb/t/innodb_bug34300.test	revid:vasil.dimov@stripped
@@ -9,6 +9,7 @@
 -- disable_result_log
 
 call mtr.add_suppression("InnoDB: Warning: a long semaphore wait:");
+call mtr.add_suppression("the age of the last checkpoint is");
 
 # set packet size and reconnect 
 let $max_packet=`select @@global.max_allowed_packet`;

No bundle (reason: useless for push emails).