Merge mysql-5.5 --> mysql-5.6

kboortz · kboortz · commit 90b83a816e53 · 2013-12-14T13:11:48.000+01:00
diff --git a/mysql-test/README b/mysql-test/README
@@ -68,6 +68,5 @@ extension. For example:
    that the bug is corrected in future releases.
 
 To submit your test case, put your .test file and .result file(s) into
-a tar.gz archive, add a README that explains the problem, ftp the 
-archive to ftp://support.mysql.com/pub/mysql/secret/ and send a mail
-to bugs@lists.mysql.com
+a tar.gz or zip archive, create a bug report at http://bugs.mysql.com/
+and attach the archive to the bug report.
diff --git a/scripts/mysql_install_db.pl.in b/scripts/mysql_install_db.pl.in
@@ -838,7 +838,7 @@ if ( open(PIPE, "| $mysqld_install_cmd_line") )
              "  cd mysql-test ; perl mysql-test-run.pl");
     }
     report($opt,
-           "Please report any problems with the " . '@scriptdir@' . "/mysqlbug script!",
+           "Please report any problems at http://bugs.mysql.com/",
            "",
            "The latest information about MySQL is available on the web at",
            "",
@@ -901,8 +901,9 @@ else
         "Please consult the MySQL manual section: 'Problems running mysql_install_db',",
         "and the manual section that describes problems on your OS.",
         "Another information source is the MySQL email archive.",
-        "Please check all of the above before mailing us!",
-        "And if you do mail us, you MUST use the " . '@scriptdir@' . "/mysqlbug script!")
+        "",
+        "Please check all of the above before submitting a bug report",
+        "at http://bugs.mysql.com/")
 }
 
 ##############################################################################
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
@@ -426,8 +426,8 @@ else
   echo "describes problems on your OS.  Another information source are the"
   echo "MySQL email archives available at http://lists.mysql.com/."
   echo
-  echo "Please check all of the above before mailing us!  And remember, if"
-  echo "you do mail us, you MUST use the $scriptdir/mysqlbug script!"
+  echo "Please check all of the above before submitting a bug report"
+  echo "at http://bugs.mysql.com/"
   echo
   exit 1
 fi
@@ -478,7 +478,7 @@ then
   fi
 
   echo
-  echo "Please report any problems with the $scriptdir/mysqlbug script!"
+  echo "Please report any problems at http://bugs.mysql.com/"
   echo
 fi
 
diff --git a/scripts/mysqlaccess.sh b/scripts/mysqlaccess.sh
@@ -2423,15 +2423,15 @@ sub Print_Header {
 sub Print_Footer {
     if ($MySQLaccess::CMD) { #command-line mode
     print "\n"
-         ."BUGs can be reported by email to bugs\@mysql.com\n";
+         ."BUGs can be reported at http://bugs.mysql.com/\n";
     }
     if ($MySQLaccess::CGI) { #CGI-BIN mode
     if ($MySQLaccess::Param{'brief'}) {
     print "</table>\n";  #close table in brief-output
     }
     print "<HR>\n"
          ."<ADDRESS>\n"
-         ."BUGs can be reported by email to <a href=mailto:bugs\@mysql.com>bugs\@mysql.com</a><BR>\n"
+         ."BUGs can be reported at <a href=\"http://bugs.mysql.com/\">http://bugs.mysql.com/</a><BR>\n"
 #         ."Don't forget to mention the version $VERSION!<BR>\n"
          ."</ADDRESS>\n"
          ."</BODY>\n"
