bzr push into mysql-5.1 branch (marko.makela:3679 to 3680)

[marko.makela]

 3680 Marko Mäkelä	2012-02-02
      Suppress messages about long semaphore waits in innodb_bug34300.test.

    modified:
      mysql-test/suite/innodb/t/innodb_bug34300.test
      mysql-test/suite/innodb_plugin/t/innodb_bug34300.test
 3679 Ashish Agarwal	2012-02-02 [merge]
      BUG#11756869 - 48848: MYISAMCHK DOING SORT RECOVER IN CERTAIN
                            CASES RESETS DATA POINTER TO SMAL
      
      ISSUE: Myisamchk doing sort recover
             on a table reduces data_file_length.
             Maximum size of data file decreases,
             lesser number of rows are stored.
      
      SOLUTION: Size of data_file_length is
                fixed to the original length.

    modified:
      mysql-test/r/myisam.result
      mysql-test/t/myisam.test
      storage/myisam/mi_check.c
=== modified file 'mysql-test/suite/innodb/t/innodb_bug34300.test'
--- a/mysql-test/suite/innodb/t/innodb_bug34300.test	revid:ashish.y.agarwal@stripped202084938-01166iff2agvyjub
+++ b/mysql-test/suite/innodb/t/innodb_bug34300.test	revid:marko.makela@stripped0202100706-penzu78bhcx1eqom
@@ -7,6 +7,7 @@
 
 -- disable_query_log
 -- disable_result_log
+call mtr.add_suppression("InnoDB: Warning: a long semaphore wait:");
 
 # set packet size and reconnect 
 SET @@global.max_allowed_packet=16777216;

=== modified file 'mysql-test/suite/innodb_plugin/t/innodb_bug34300.test'
--- a/mysql-test/suite/innodb_plugin/t/innodb_bug34300.test	revid:[e-mail]-20120202084938-01166iff2agvyjub
+++ b/mysql-test/suite/innodb_plugin/t/innodb_bug34300.test	revid:marko.makela@stripped
@@ -7,6 +7,7 @@
 
 -- disable_query_log
 -- disable_result_log
+call mtr.add_suppression("InnoDB: Warning: a long semaphore wait:");
 
 # set packet size and reconnect 
 let $max_packet=`select @@global.max_allowed_packet`;

No bundle (reason: useless for push emails).