bzr push into mysql-trunk branch (bjorn.munch:3362 to 3363)

[Bjorn Munch]

 3363 Bjorn Munch	2011-08-12 [merge]
      upmerge small fix to test mysql_plugin

    modified:
      mysql-test/t/mysql_plugin.test
 3362 Sunny Bains	2011-08-12
      Remove bogus comment.

    modified:
      storage/innobase/read/read0read.c
=== modified file 'mysql-test/t/mysql_plugin.test'
--- a/mysql-test/t/mysql_plugin.test	2011-08-09 19:09:28 +0000
+++ b/mysql-test/t/mysql_plugin.test	2011-08-12 10:49:38 +0000
@@ -288,11 +288,11 @@ let $MYSQL_PLUGIN_CMD= $MYSQL_PLUGIN -n
 --echo # Show the help.
 --echo #
 replace_result $MYSQL_PLUGIN mysql_plugin;
---replace_regex /Ver [0-9.]+ Distrib [0-9.]+/Ver V.V.VV Distrib XX.XX.XX/
+--replace_regex /Ver [0-9.]+ Distrib [0-9.]+/Ver V.V.VV Distrib XX.XX.XX/ /XX-m[0-9]+/XX/
 --exec $MYSQL_PLUGIN --help
 
 replace_result $MYSQL_PLUGIN mysql_plugin;
---replace_regex /Ver [0-9.]+ Distrib [0-9.]+/Ver V.V.VV Distrib XX.XX.XX/
+--replace_regex /Ver [0-9.]+ Distrib [0-9.]+/Ver V.V.VV Distrib XX.XX.XX/ /XX-m[0-9]+/XX/
 --exec $MYSQL_PLUGIN --version
 
 #

No bundle (reason: useless for push emails).