bzr push into mysql-5.5 branch (chuck.bell:3593 to 3594) WL#5710

[chuck.bell]

 3594 chuck.bell@stripped	2011-11-04
      WL#5710 : mysql_plugin client - Windows PB fix
      
      This patch corrects the test mysql_plugin so that it correctly masks
      the library extension of the plugin daemon_example.

    modified:
      mysql-test/t/mysql_plugin.test
 3593 Jimmy Yang	2011-11-03
      Fix Bug #12941439 - WITH UNIV_SYNC_DEBUG, PERF SCHEMA, INITIALIZATION
      OF 16G BUFFER POOL TAKES HOURS
      
      rb://787 approved by Sunny

    modified:
      storage/innobase/buf/buf0buf.c
=== modified file 'mysql-test/t/mysql_plugin.test'
--- a/mysql-test/t/mysql_plugin.test	2011-10-17 19:30:28 +0000
+++ b/mysql-test/t/mysql_plugin.test	2011-11-04 12:59:28 +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).