bzr push into mysql-trunk-wl5522 branch (kevin.lewis:3856 to 3857)

[kevin.lewis]

 3857 kevin.lewis@stripped	2012-04-05
      Update mysql-test/r/mysql_plugin.result since VERSION file was updated.

    modified:
      mysql-test/r/mysql_plugin.result
 3856 Sunny Bains	2012-04-06 [merge]
      labs-release-2012: Merge from mysql-trunk-wl5522.

    modified:
      storage/innobase/dict/dict0mem.cc
      storage/innobase/fil/fil0fil.cc
      storage/innobase/fsp/fsp0fsp.cc
      storage/innobase/include/dict0dict.h
      storage/innobase/include/dict0dict.ic
      storage/innobase/include/fsp0fsp.h
      storage/innobase/include/fsp0fsp.ic
      storage/innobase/row/row0import.cc
=== modified file 'mysql-test/r/mysql_plugin.result'
--- a/mysql-test/r/mysql_plugin.result	revid:sunny.bains@stripped
+++ b/mysql-test/r/mysql_plugin.result	revid:kevin.lewis@stripped
@@ -101,7 +101,7 @@ ERROR: Missing --plugin_dir option.
 #
 # Show the help.
 #
-mysql_plugin  Ver V.V.VV Distrib XX.XX.XX
+mysql_plugin  Ver V.V.VV Distrib XX.XX.XX-labs-april-2012
 Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 
 Enable or disable plugins.

No bundle (reason: useless for push emails).