bzr push into mysql-trunk branch (chuck.bell:3559 to 3560) WL#5710

[chuck.bell]

 3560 chuck.bell@stripped	2011-11-04 [merge]
      Merge with mysql-5.5 tree after push for WL#5710 PB fix.

    modified:
      mysql-test/t/mysql_plugin.test
 3559 Bjorn Munch	2011-11-04 [merge]
      merge trunk-mtr => trunk: simplify some tests with ONCE modifier to --disable_xxx

    modified:
      mysql-test/suite/funcs_1/t/storedproc.test
      mysql-test/suite/perfschema/t/socket_instances_func.test
      mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test
      mysql-test/suite/rpl/t/rpl_temporary.test
      mysql-test/t/csv.test
      mysql-test/t/information_schema_parameters.test
      mysql-test/t/information_schema_routines.test
      mysql-test/t/lock.test
      mysql-test/t/mysqlbinlog2.test
      mysql-test/t/ps.test
      mysql-test/t/ps_ddl.test
      mysql-test/t/sp-error.test
      mysql-test/t/sp.test
      mysql-test/t/trigger.test
      mysql-test/t/view_grant.test
=== modified file 'mysql-test/t/mysql_plugin.test'
--- a/mysql-test/t/mysql_plugin.test	2011-10-18 12:33:26 +0000
+++ b/mysql-test/t/mysql_plugin.test	2011-11-04 13:04:48 +0000
@@ -142,8 +142,11 @@ EOF
 --echo # Simulate loading a plugin libary with multiple entry points.
 --echo # This will test the DISABLE to ensure all rows are removed.
 --echo #
+--replace_regex /\.dll/.so/
 eval INSERT INTO mysql.plugin VALUES ('wicky', '$DAEMONEXAMPLE'); 
+--replace_regex /\.dll/.so/
 eval INSERT INTO mysql.plugin VALUES ('wacky', '$DAEMONEXAMPLE'); 
+--replace_regex /\.dll/.so/
 eval INSERT INTO mysql.plugin VALUES ('wonky', '$DAEMONEXAMPLE'); 
 
 --echo #

No bundle (reason: useless for push emails).