bk commit into 4.1 tree (joerg:1.2493)

[Joerg Bruehe]

Below is the list of changes that have just been committed into a local
4.1 repository of joerg. When joerg does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2493 06/06/09 14:37:24 joerg@stripped +1 -0
  Merge trift2.mysql.com:/M41/bug20303-4.1
  into trift2.mysql.com:/M41/mysql-4.1

  mysql-test/mysql-test-run.pl
    1.66 06/06/09 14:37:22 joerg@stripped +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	joerg
# Host:	trift2.
# Root:	/M41/mysql-4.1/RESYNC

--- 1.65/mysql-test/mysql-test-run.pl	2006-05-24 10:15:00 +02:00
+++ 1.66/mysql-test/mysql-test-run.pl	2006-06-09 14:37:22 +02:00
@@ -611,6 +611,12 @@
     {
       push(@opt_extra_mysqld_opt, $arg);
     }
+    elsif ( $arg =~ /^--$/ )
+    {
+      # It is an effect of setting 'pass_through' in option processing
+      # that the lone '--' separating options from arguments survives,
+      # simply ignore it.
+    }
     elsif ( $arg =~ /^-/ )
     {
       usage("Invalid option \"$arg\"");
@@ -2461,6 +2467,13 @@
 ##############################################################################
 
 sub usage ($) {
+  my $message= shift;
+
+  if ( $message )
+  {
+    print STDERR "$message \n";
+  }
+
   print STDERR <<HERE;
 
 mysql-test-run [ OPTIONS ] [ TESTCASE ]