From e703227a23b9be1d473751d9d655e5f4294efabe Mon Sep 17 00:00:00 2001
From: unknown <msvensson@neptunus.(none)>
Date: Fri, 24 Nov 2006 13:39:09 +0100
Subject: [PATCH] Fix merge conflicts

---
 mysql-test/mysql-test-run.pl | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 4f32ae17724..79c3ac6582d 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -187,7 +187,6 @@ our $opt_fast;
 our $opt_force;
 our $opt_reorder= 0;
 our $opt_enable_disabled;
-our $opt_report_features;
 our $opt_mem= $ENV{'MTR_MEM'};
 
 our $opt_gcov;
@@ -656,7 +655,7 @@ sub command_line_setup () {
   # directory. And we install "/usr/share/mysql-test". Moving up one
   # more directory relative to "mysql-test" gives us a usable base
   # directory for RPM installs.
-  if ( ! $opt_source_dist and ! -d "$glob_basedir/bin" )
+  if ( ! $source_dist and ! -d "$glob_basedir/bin" )
   {
     $glob_basedir= dirname($glob_basedir);
   }