bzr push into mysql-trunk branch (joerg.bruehe:3483 to 3484)

[Joerg Bruehe]

 3484 Joerg Bruehe	2011-10-10 [merge]
      Auto-upmerge a fix for test "file_contents" from 5.5 to trunk.

    modified:
      mysql-test/t/file_contents.test
 3483 Raghav Kapoor	2011-10-10
      
      BUG#11765553 - 58534: MYSQL_INSTALL_DB PRINTS INCOMPLETE OPTION NAME 
      
      BACKGROUND:
      
      "--skip-grant" is an incomplete option name. It should be
      "--skip-grant-tables" in mysql_install_db.sh.Besides,full 
      option name should be displayed, not some arbitrary shorthand.
      
      
      FIX:
      
      One change has been made in file mysql_install_db.sh at 
      line 408 where "shell> $mysqld --skip-grant &" is replaced
      by "shell> $mysqld --skip-grant-tables &" to complete the 
      option name.

    modified:
      scripts/mysql_install_db.pl.in
      scripts/mysql_install_db.sh
      sql/udf_example.c
=== modified file 'mysql-test/t/file_contents.test'
--- a/mysql-test/t/file_contents.test	2011-03-11 15:00:53 +0000
+++ b/mysql-test/t/file_contents.test	2011-10-10 12:03:29 +0000
@@ -15,9 +15,9 @@ if ($dir_bin =~ m|/usr/|) {
   # RPM package
   $dir_docs = $dir_bin;
   $dir_docs =~ s|/lib|/share/doc|;
-  if(-d "$dir_docs/packages/MySQL-server") {
-    # SuSE
-    $dir_docs = "$dir_docs/packages/MySQL-server";
+  if(-d "$dir_docs/packages") {
+    # SuSE: "packages/" in the documentation path
+    $dir_docs = glob "$dir_docs/packages/MySQL-server*";
   } else {
     # RedHat: version number in directory name
     $dir_docs = glob "$dir_docs/MySQL-server*";
@@ -25,9 +25,9 @@ if ($dir_bin =~ m|/usr/|) {
 } elsif ($dir_bin =~ m|/usr$|) {
   # RPM build during development
   $dir_docs = "$dir_bin/share/doc";
-  if(-d "$dir_docs/packages/MySQL-server") {
-    # SuSE
-    $dir_docs = "$dir_docs/packages/MySQL-server";
+  if(-d "$dir_docs/packages") {
+    # SuSE: "packages/" in the documentation path
+    $dir_docs = glob "$dir_docs/packages/MySQL-server*";
   } else {
     # RedHat: version number in directory name
     $dir_docs = glob "$dir_docs/MySQL-server*";

No bundle (reason: useless for push emails).