Merge mysql.com:/M50/comment-5.0 into mysql.com:/M51/comment-5.1

mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged

2 files changed, 18 insertions, 1 deletions

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 62ce4da253e..a40ee5b8a63 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -198,6 +198,7 @@ our $opt_big_test= 0;            # Send --big-test to mysqltest
 
 our @opt_extra_mysqld_opt;
 
+our $opt_comment;
 our $opt_compress;
 our $opt_ssl;
 our $opt_skip_ssl;
@@ -669,6 +670,14 @@ sub command_line_setup () {
     print '#' x 78, "\n\n";
   }
 
+  if ( $opt_comment )
+  {
+    print "\n";
+    print '#' x 78, "\n";
+    print "# $opt_comment\n";
+    print '#' x 78, "\n\n";
+  }
+
   foreach my $arg ( @ARGV )
   {
     if ( $arg =~ /^--skip-/ )
@@ -3256,6 +3265,7 @@ Options for coverage, profiling etc
 
 Misc options
 
+  comment=STR           Write STR to the output
   verbose               Verbose output from this script
   script-debug          Debug this script itself
   timer                 Show test case execution time
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index c0875955b4e..64dc079af7c 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -601,7 +601,14 @@ while test $# -gt 0; do
       FAST_START=1
       ;;
     --use-old-data)
-      USE_OLD_DATA=1;
+      USE_OLD_DATA=1
+      ;;
+    --comment=*)
+      TMP=`$ECHO "$1" | $SED -e "s;--comment=;;"`
+      echo
+      echo '############################################'
+      echo "# $TMP"
+      echo '############################################'
       ;;
     -- )  shift; break ;;
     --* ) $ECHO "Unrecognized option: $1"; exit 1 ;;