bzr push into mysql-trunk branch (anitha.gopi:3481 to 3482)

[Anitha Gopi]

 3482 Anitha Gopi	2011-01-11 [merge]
      Upmerge revision 3232 from mysql-5.5

    modified:
      mysql-test/collections/default.experimental
 3481 He Zhenxing	2011-01-11
      BUG#59123 rpl_stm_binlog_max_cache_size fails sporadically with found warnings
      
      rpl_stm_binlog_max_cache_size.test fails sporadically on PB2 
      daily-trunk-bugfixing with binlog-checksum enabled, the expected
      incident error message was not properly suppressed, and the
      incident message would have extra strange characters appended.
      
      The cause is that the incident error message restored from log event
      is not properly ended with '\0'. This does not cause problem normally
      because the error message is at the end of the event, and we add
      a '\0' at the end of an event. but when binlog-checksum is enabled,
      the checksum value will be after the message, and so extra strange
      characters could be shown and cause the suppression rule to fail.
      
      Fixed the problem by allocate memory for the string and added '\0'
      at the end of the message.

    modified:
      sql/log_event.cc
      sql/log_event.h
=== modified file 'mysql-test/collections/default.experimental'
--- a/mysql-test/collections/default.experimental	2011-01-10 14:57:43 +0000
+++ b/mysql-test/collections/default.experimental	2011-01-11 08:09:22 +0000
@@ -12,7 +12,6 @@ main.gis                                
 main.gis-rtree @freebsd                  # Bug#38965 2010-05-04 alik test cases gis-rtree, type_float, type_newdecimal fail in embedded server
 main.information_schema                  # Bug#47449 2009-09-19 alik main.information_schema and innodb.innodb_information_schema fail sporadically
 main.lock_multi_bug38499                 # Bug#47448 2009-09-19 alik main.lock_multi_bug38499 times out sporadically
-main.lock_multi_bug38691 @solaris        # Bug#47792 2009-10-02 alik main.lock_multi_bug38691 times out sporadically on Solaris 10
 main.lowercase_table2 @darwin            # Bug#55509 2010-07-26 alik main.lowercase_table2 fails on Mac OSX (again)
 main.mysqlslap @windows                  # Bug#54024 2010-08-10 alik mysqlslap fails sporadically starting from Dahlia
 main.outfile_loaddata @solaris           # Bug#46895 2010-01-20 alik Test "outfile_loaddata" fails (reproducible)


Attachment: [text/bzr-bundle] bzr/[e-mail]