database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

mysql-test/mysql-test-run.pl

Browse Source 
set --language correctly even for --help (to have full plugin help)
mysql-test/lib/mtr_cases.pl
    more robust check for innodb


mysql-test/lib/mtr_cases.pl:
  more robust check for innodb
mysql-test/mysql-test-run.pl:
  set --language correctly even for --help (to have full plugin help)
This commit is contained in:
unknown
2007-04-18 14:24:09 +02:00
parent dcef028f71
commit 56113a7c12
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/lib/mtr_cases.pl
View File

@@ -580,7 +580,7 @@ sub collect_one_test_case($$$$$$$) {
if ( $tinfo->{'innodb_test'} ) if ( $tinfo->{'innodb_test'} )
{ {
# This is a test that need innodb # This is a test that need innodb
if ( $::mysqld_variables{'innodb'} eq "FALSE" ) if ( $::mysqld_variables{'innodb'} ne "TRUE" )
{ {
# innodb is not supported, skip it # innodb is not supported, skip it
$tinfo->{'skip'}= 1; $tinfo->{'skip'}= 1;

22
mysql-test/mysql-test-run.pl
View File

@@ -58,7 +58,7 @@ $Devel::Trace::TRACE= 0; # Don't trace boring init stuff
use File::Path; use File::Path;
use File::Basename; use File::Basename;
use File::Copy; use File::Copy;
use File::Temp qw / tempdir /; use File::Temp qw /tempdir/;
use Cwd; use Cwd;
use Getopt::Long; use Getopt::Long;
use Sys::Hostname; use Sys::Hostname;
@@ -113,6 +113,7 @@ our $glob_basedir;
our $path_charsetsdir; our $path_charsetsdir;
our $path_client_bindir; our $path_client_bindir;
our $path_share;
our $path_language; our $path_language;
our $path_timefile; our $path_timefile;
our $path_snapshot; our $path_snapshot;
@@ -704,6 +705,15 @@ sub command_line_setup () {
"$glob_basedir/client", "$glob_basedir/client",
"$glob_basedir/bin"); "$glob_basedir/bin");
# Look for language files and charsetsdir, use same share
$path_share= mtr_path_exists("$glob_basedir/share/mysql",
"$glob_basedir/sql/share",
"$glob_basedir/share");
$path_language= mtr_path_exists("$path_share/english");
$path_charsetsdir= mtr_path_exists("$path_share/charsets");
if (!$opt_extern) if (!$opt_extern)
{ {
$exe_mysqld= mtr_exe_exists (vs_config_dirs('sql', 'mysqld'), $exe_mysqld= mtr_exe_exists (vs_config_dirs('sql', 'mysqld'),
@@ -1351,7 +1361,7 @@ sub collect_mysqld_features () {
# --no-defaults and --skip-grant-tables are to avoid loading # --no-defaults and --skip-grant-tables are to avoid loading
# system-wide configs and plugins # system-wide configs and plugins
# #
my $list= `$exe_mysqld --no-defaults --skip-grant-tables --verbose --help`; my $list= `$exe_mysqld --no-defaults --language=$path_language --skip-grant-tables --verbose --help`;
foreach my $line (split('\n', $list)) foreach my $line (split('\n', $list))
{ {
@@ -1514,14 +1524,6 @@ sub executable_setup () {
} }
} }
# Look for language files and charsetsdir, use same share
my $path_share= mtr_path_exists("$glob_basedir/share/mysql",
"$glob_basedir/sql/share",
"$glob_basedir/share");
$path_language= mtr_path_exists("$path_share/english");
$path_charsetsdir= mtr_path_exists("$path_share/charsets");
# Look for my_print_defaults # Look for my_print_defaults
$exe_my_print_defaults= $exe_my_print_defaults=
mtr_exe_exists(vs_config_dirs('extra', 'my_print_defaults'), mtr_exe_exists(vs_config_dirs('extra', 'my_print_defaults'),