followup fixes after merge to -trunk

mysql-test/collections/default.experimental

@@ -4,5 +4,7 @@ main.ctype_gbk_binlog @solaris           # Bug#46010: main.ctype_gbk_binlog fail
 rpl.rpl_row_create_table*                # Bug#45576: rpl_row_create_table fails on PB2
 rpl_ndb.rpl_ndb_log                      # Bug#38998
 rpl.rpl_innodb_bug28430* @solaris        # Bug#46029
-main.plugin_load  @solaris               # Bug #42144
+main.plugin_load  @solaris               # Bug#42144
 rpl.rpl_get_master_version_and_clock*    # Bug#46931 2009-08-26 alik rpl.rpl_get_master_version_and_clock fails on hpux11.31
+main.plugin*  @solaris                   # Bug#47146 Linking problem with example plugin when dtrace enabled
+rpl.rpl_plugin_load*  @solaris           # Bug#47146

mysql-test/r/bug46080.result

@@ -2,6 +2,8 @@
 # Bug #46080: group_concat(... order by) crashes server when
 #  sort_buffer_size cannot allocate
 #
+call mtr.add_suppression("Out of memory at line .*, 'my_alloc.c'");
+call mtr.add_suppression("needed .* byte .*k., memory in use: .* bytes .*k");
 CREATE TABLE t1(a CHAR(255));
 INSERT INTO t1 VALUES ('a');
 SET @@SESSION.sort_buffer_size=5*16*1000000;

mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result

@@ -4,6 +4,8 @@ reset master;
 reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
+call mtr.add_suppression("Slave I/O: Get master clock failed with error: Lost connection to MySQL server at 'reading initial communication packet'");
+call mtr.add_suppression("Slave I/O: Master command COM_REGISTER_SLAVE failed: failed registering on master, reconnecting to try again");
 SELECT IS_FREE_LOCK("debug_lock.before_get_UNIX_TIMESTAMP");
 IS_FREE_LOCK("debug_lock.before_get_UNIX_TIMESTAMP")
 1

mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test

@@ -16,6 +16,10 @@
 
 source include/master-slave.inc;
 source include/have_debug.inc;
+
+call mtr.add_suppression("Slave I/O: Get master clock failed with error: Lost connection to MySQL server at 'reading initial communication packet'");
+call mtr.add_suppression("Slave I/O: Master command COM_REGISTER_SLAVE failed: failed registering on master, reconnecting to try again");
+
 #Test case 1: Try to get the value of the UNIX_TIMESTAMP from master under network disconnection
 connection slave;
 let $debug_saved= `select @@global.debug`;

mysql-test/t/bug46080.test

@@ -3,6 +3,9 @@
 --echo #  sort_buffer_size cannot allocate
 --echo #
 
+call mtr.add_suppression("Out of memory at line .*, 'my_alloc.c'");
+call mtr.add_suppression("needed .* byte .*k., memory in use: .* bytes .*k");
+
 CREATE TABLE t1(a CHAR(255));
 INSERT INTO t1 VALUES ('a');