Auto-merge from mysql-trunk-bugfixing.

mysql-test/collections/default.experimental

@@ -12,7 +12,6 @@ main.lock_multi_bug38499                 # Bug#47448 2009-09-19 alik main.lock_m
 main.lock_multi_bug38691 @solaris        # Bug#47792 2009-10-02 alik main.lock_multi_bug38691 times out sporadically on Solaris 10
 main.log_tables                          # Bug#47924 2009-10-08 alik main.log_tables times out sporadically 
 main.plugin                              # Bug#47146 Linking problem with example plugin when dtrace enabled
-main.plugin_load                         # Bug#47146
 
 rpl.rpl_get_master_version_and_clock*    # Bug#49191 2009-12-01 Daogang rpl_get_master_version_and_clock failed on PB2: COM_REGISTER_SLAVE failed
 rpl.rpl_heartbeat_basic                  # BUG#43828 2009-10-22 luis fails sporadically

mysql-test/t/disabled.def

@@ -13,3 +13,4 @@ kill                     : Bug#37780 2008-12-03 HHunger need some changes to be
 query_cache_28249        : Bug#43861 2009-03-25 main.query_cache_28249 fails sporadicallyr
 innodb-autoinc           : Bug#49267 2009-12-02 test fails on windows because of different case mode
 innodb                   : Bug#49396 2009-12-03 test fails in embedded mode
+plugin_load              : Bug#42144 2009-12-21 alik plugin_load fails