From 626faeecd9cb741f18e901cee0335ada914ee76f Mon Sep 17 00:00:00 2001
From: "msvensson@shellback.(none)" <>
Date: Fri, 5 Oct 2007 17:54:19 +0200
Subject: [PATCH] Bug#31398 problems with mysql-test-run  - "mysqld --verbose
 --help" need to be started in a writable directory

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

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index ad507440bb7..a835d3bc1a9 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -1334,12 +1334,13 @@ sub datadir_list_setup () {
 
 sub collect_mysqld_features () {
   my $found_variable_list_start= 0;
+  my $tmpdir= tempdir(CLEANUP => 0); # Directory removed by this function
 
   #
   # Execute "mysqld --no-defaults --help --verbose" to get a
   # list of all features and settings
   #
-  my $list= `$exe_mysqld --no-defaults --verbose --help`;
+  my $list= `$exe_mysqld --no-defaults --datadir=$tmpdir --verbose --help`;
 
   foreach my $line (split('\n', $list))
   {
@@ -1394,7 +1395,7 @@ sub collect_mysqld_features () {
       }
     }
   }
-
+  rmtree($tmpdir);
   mtr_error("Could not find version of MySQL") unless $mysql_version_id;
   mtr_error("Could not find variabes list") unless $found_variable_list_start;