bk commit into 5.0 tree (msvensson:1.2592)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson 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@stripped, 2007-11-08 14:24:31+01:00, msvensson@shellback.(none) +1 -0
  Backport "mysqld --help --verbose"'s parameters from 5.1

  mysql-test/mysql-test-run.pl@stripped, 2007-11-08 14:24:29+01:00, msvensson@shellback.(none) +8 -1
    Backport "mysqld --help --verbose"'s parameters from 5.1

diff -Nrup a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
--- a/mysql-test/mysql-test-run.pl	2007-11-08 13:50:28 +01:00
+++ b/mysql-test/mysql-test-run.pl	2007-11-08 14:24:29 +01:00
@@ -1155,12 +1155,18 @@ sub set_mtr_build_thread_ports($) {
 
 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`;
+  # --no-defaults and --skip-grant-tables are to avoid loading
+  # system-wide configs and plugins
+  #
+  # --datadir must exist, mysqld will chdir into it
+  #
+  my $list= `$exe_mysqld --no-defaults --datadir=$tmpdir --language=$path_language --skip-grant-tables --verbose --help`;
 
   foreach my $line (split('\n', $list))
   {
@@ -1216,6 +1222,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;