bzr push into mysql-trunk branch (vasil.dimov:3931 to 3932)

[vasil.dimov]

 3932 Vasil Dimov	2012-02-20
      Followup to the merge from mysql-5.5
      (vasil.dimov@stripped)
      
      The help text for --ignore-builtin-innodb is different in mysql-trunk.

    modified:
      mysql-test/r/mysqld--help-notwin.result
      mysql-test/r/mysqld--help-win.result
 3931 Tor Didriksen	2012-02-20
      WL#6008 : Replace custom encryption code with approved
      
      Post-push fix for link failure:
      /usr/bin/ld: ../extra/yassl/libyassl.a(ssl.cpp.o): 
      relocation R_X86_64_PC32 against 
      `vtable for TaoCrypt::HASH' can not be used when making a shared object; 
      recompile with -fPIC
      
      We *do* compile with -fPIC.
      The problem was different visibility of symbols.

    modified:
      libmysql/CMakeLists.txt
=== modified file 'mysql-test/r/mysqld--help-notwin.result'
--- a/mysql-test/r/mysqld--help-notwin.result	revid:tor.didriksen@stripped
+++ b/mysql-test/r/mysqld--help-notwin.result	revid:vasil.dimov@stripped
@@ -196,8 +196,8 @@ The following options may be given as th
  GROUP_CONCAT()
  -?, --help          Display this help and exit.
  --ignore-builtin-innodb 
- DEPRECATED. This option will be removed in future
- releases. Disable initialization of builtin InnoDB plugin
+ IGNORED. 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:tor.didriksen@stripped
+++ b/mysql-test/r/mysqld--help-win.result	revid:vasil.dimov@stripped
@@ -196,8 +196,8 @@ The following options may be given as th
  GROUP_CONCAT()
  -?, --help          Display this help and exit.
  --ignore-builtin-innodb 
- DEPRECATED. This option will be removed in future
- releases. Disable initialization of builtin InnoDB plugin
+ IGNORED. 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).