From 5091df133375d9a589a7776417edcb2d51503c09 Mon Sep 17 00:00:00 2001
From: "joerg@mysql.com" <>
Date: Thu, 8 Jun 2006 14:52:33 +0200
Subject: [PATCH 1/2] mysql-test/mysql-test-run.pl  :    A fix for bug#20303
 "mysql-test-run.pl: Does not recognize -- argument"

---
 mysql-test/mysql-test-run.pl | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 4e0020b79a2..2399911cff3 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -610,6 +610,12 @@ sub command_line_setup () {
     {
       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\"");

From a26c9c31a19cc89b9ae7cd5e56d1c46fe9d0edd5 Mon Sep 17 00:00:00 2001
From: "joerg@mysql.com" <>
Date: Thu, 8 Jun 2006 19:55:22 +0200
Subject: [PATCH 2/2] mysql-test/mysql-test-run.pl  :  Output the usage error
 if one is given. (Found when fixing bug#20303)

---
 mysql-test/mysql-test-run.pl | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 2399911cff3..a20f39b59fc 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -2459,6 +2459,13 @@ sub valgrind_arguments {
 ##############################################################################
 
 sub usage ($) {
+  my $message= shift;
+
+  if ( $message )
+  {
+    print STDERR "$message \n";
+  }
+
   print STDERR <<HERE;
 
 mysql-test-run [ OPTIONS ] [ TESTCASE ]