bzr push into mysql-trunk branch (vasil.dimov:3928 to 3929)

[vasil.dimov]

 3929 Vasil Dimov	2012-02-20 [merge]
      Merge mysql-5.5 -> mysql-trunk

    modified:
      mysql-test/r/mysqld--help-notwin.result
      mysql-test/r/mysqld--help-win.result
 3928 Tatjana Azundris Nuernberg	2012-02-19 [merge]
      NULL merge

=== modified file 'mysql-test/r/mysqld--help-notwin.result'
--- a/mysql-test/r/mysqld--help-notwin.result	revid:tatjana.nuernberg@stripped
+++ b/mysql-test/r/mysqld--help-notwin.result	revid:vasil.dimov@stripped
@@ -196,7 +196,8 @@ The following options may be given as th
  GROUP_CONCAT()
  -?, --help          Display this help and exit.
  --ignore-builtin-innodb 
- Disable initialization of builtin InnoDB plugin
+ DEPRECATED. This option will be removed in future
+ releases. Disable initialization of builtin InnoDB plugin
  --ignore-db-dir=name 
  Specifies a directory to add to the ignore list when
  collecting database names from the datadir. Put a blank

=== modified file 'mysql-test/r/mysqld--help-win.result'
--- a/mysql-test/r/mysqld--help-win.result	revid:tatjana.nuernberg@stripped
+++ b/mysql-test/r/mysqld--help-win.result	revid:vasil.dimov@stripped
@@ -196,7 +196,8 @@ The following options may be given as th
  GROUP_CONCAT()
  -?, --help          Display this help and exit.
  --ignore-builtin-innodb 
- Disable initialization of builtin InnoDB plugin
+ DEPRECATED. This option will be removed in future
+ releases. Disable initialization of builtin InnoDB plugin
  --ignore-db-dir=name 
  Specifies a directory to add to the ignore list when
  collecting database names from the datadir. Put a blank

No bundle (reason: useless for push emails).