diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-15 08:13:30 -0300 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-15 08:13:30 -0300 |
| commit | 07e7b4d6fe590cb49a5009842d3153520f2e1a36 (patch) | |
| tree | 2c9b96009bfea8eef82d21e14a61f7306827f917 /mysql-test/lib/v1 | |
| parent | ef27448469171b0d7a045b19af378af9b514b6af (diff) | |
| download | mariadb-git-07e7b4d6fe590cb49a5009842d3153520f2e1a36.tar.gz | |
WL#5486: Remove code for unsupported platforms
Remove Netware specific code.
Diffstat (limited to 'mysql-test/lib/v1')
| -rw-r--r-- | mysql-test/lib/v1/mtr_misc.pl | 1 | ||||
| -rwxr-xr-x | mysql-test/lib/v1/mysql-test-run.pl | 8 |
2 files changed, 2 insertions, 7 deletions
diff --git a/mysql-test/lib/v1/mtr_misc.pl b/mysql-test/lib/v1/mtr_misc.pl index 0173e8b8572..da2395a8a95 100644 --- a/mysql-test/lib/v1/mtr_misc.pl +++ b/mysql-test/lib/v1/mtr_misc.pl @@ -141,7 +141,6 @@ sub mtr_exe_maybe_exists (@) { my @path= @_; map {$_.= ".exe"} @path if $::glob_win32; - map {$_.= ".nlm"} @path if $::glob_netware; foreach my $path ( @path ) { if($::glob_win32) diff --git a/mysql-test/lib/v1/mysql-test-run.pl b/mysql-test/lib/v1/mysql-test-run.pl index 8a5edfbd762..489db060e99 100755 --- a/mysql-test/lib/v1/mysql-test-run.pl +++ b/mysql-test/lib/v1/mysql-test-run.pl @@ -76,7 +76,6 @@ $| = 1; # Automatically flush STDOUT our $glob_win32_perl= ($^O eq "MSWin32"); # ActiveState Win32 Perl our $glob_cygwin_perl= ($^O eq "cygwin"); # Cygwin Perl our $glob_win32= ($glob_win32_perl or $glob_cygwin_perl); -our $glob_netware= ($^O eq "NetWare"); # NetWare require "lib/v1/mtr_cases.pl"; require "lib/v1/mtr_im.pl"; @@ -3125,11 +3124,8 @@ sub install_db ($$) { $path_vardir_trace, $type); } - if ( ! $glob_netware ) - { - mtr_add_arg($args, "--lc-messages-dir=%s", $path_language); - mtr_add_arg($args, "--character-sets-dir=%s", $path_charsetsdir); - } + mtr_add_arg($args, "--lc-messages-dir=%s", $path_language); + mtr_add_arg($args, "--character-sets-dir=%s", $path_charsetsdir); # If DISABLE_GRANT_OPTIONS is defined when the server is compiled (e.g., # configure --disable-grant-options), mysqld will not recognize the |