diff options
Diffstat (limited to 'mysql-test/lib')
| -rw-r--r-- | mysql-test/lib/My/ConfigFactory.pm | 3 | ||||
| -rw-r--r-- | mysql-test/lib/My/Debugger.pm | 6 | ||||
| -rw-r--r-- | mysql-test/lib/mtr_cases.pm | 6 | ||||
| -rw-r--r-- | mysql-test/lib/openssl.cnf | 2 | ||||
| -rwxr-xr-x | mysql-test/lib/v1/mysql-test-run.pl | 37 |
5 files changed, 27 insertions, 27 deletions
diff --git a/mysql-test/lib/My/ConfigFactory.pm b/mysql-test/lib/My/ConfigFactory.pm index 261de37ab54..3249a06256c 100644 --- a/mysql-test/lib/My/ConfigFactory.pm +++ b/mysql-test/lib/My/ConfigFactory.pm @@ -216,6 +216,7 @@ my @mysqld_rules= my @client_rules= ( { 'character-sets-dir' => \&fix_charset_dir }, + { 'plugin-dir' => sub { $::client_plugindir } }, ); @@ -346,7 +347,7 @@ sub resolve_at_variable { or croak "There is no group named '$group_name' that ", "can be used to resolve '$option_name' for test '$self->{testname}'"; - my $value= $from_group->value($option_name); + my $value= $from_group->value($option_name) || ''; $res .= $before.$value; } $res .= $after; diff --git a/mysql-test/lib/My/Debugger.pm b/mysql-test/lib/My/Debugger.pm index e7428572ca4..0f2585f45a7 100644 --- a/mysql-test/lib/My/Debugger.pm +++ b/mysql-test/lib/My/Debugger.pm @@ -125,10 +125,10 @@ for my $k (sort keys %debuggers) { $v->{script} = '' unless $v->{script}; $v->{options} =~ s/(\{exe\}|$)/ {options} $&/ unless $v->{options} =~ /\{options\}/; - register_opt "$k" => "Start mysqld"; - register_opt "client-$k" => "Start mysqltest client"; + register_opt "$k" => "Start mariadbd"; + register_opt "client-$k" => "Start mariadb-test client"; register_opt "boot-$k" => "Start bootstrap server"; - register_opt "manual-$k" => "Before running test(s) let user manually start mysqld"; + register_opt "manual-$k" => "Before running test(s) let user manually start mariadbd"; } sub subst($%) { diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm index d289eb0a888..fe202279ac7 100644 --- a/mysql-test/lib/mtr_cases.pm +++ b/mysql-test/lib/mtr_cases.pm @@ -64,8 +64,8 @@ my $plugin_suitedir_regex; my $overlay_regex; if (-d '../sql') { - @plugin_suitedirs= ('storage/*/mysql-test', 'plugin/*/mysql-test'); - $overlay_regex= '\b(?:storage|plugin)/(\w+)/mysql-test\b'; + @plugin_suitedirs= ('storage/*/mysql-test', 'plugin/*/mysql-test', 'storage/*/*/mysql-test', ); + $overlay_regex= '\b(?:storage|plugin|storage[/][^/]*)/(\w+)/mysql-test\b'; } else { @plugin_suitedirs= ('mysql-test/plugin/*'); $overlay_regex= '\bmysql-test/plugin/(\w+)\b'; @@ -747,7 +747,7 @@ sub collect_one_test_case { if ( $enable_disabled ) { # User has selected to run all disabled tests - mtr_report(" - $tinfo->{name} wil be run although it's been disabled\n", + mtr_report(" - $tinfo->{name} will be run although it's been disabled\n", " due to '$disable'"); } else diff --git a/mysql-test/lib/openssl.cnf b/mysql-test/lib/openssl.cnf index b9ab37ac3a1..7cd6f748af2 100644 --- a/mysql-test/lib/openssl.cnf +++ b/mysql-test/lib/openssl.cnf @@ -9,4 +9,4 @@ ssl_conf = ssl_section system_default = system_default_section [system_default_section] -CipherString = ALL:@SECLEVEL=1 +CipherString = ALL:@SECLEVEL=0 diff --git a/mysql-test/lib/v1/mysql-test-run.pl b/mysql-test/lib/v1/mysql-test-run.pl index 08f256bb2f2..aabe3d7521b 100755 --- a/mysql-test/lib/v1/mysql-test-run.pl +++ b/mysql-test/lib/v1/mysql-test-run.pl @@ -2,16 +2,16 @@ # -*- cperl -*- # Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA @@ -572,7 +572,7 @@ sub command_line_setup () { 'valgrind-path=s' => \$opt_valgrind_path, 'callgrind' => \$opt_callgrind, - # Stress testing + # Stress testing 'stress' => \$opt_stress, 'stress-suite=s' => \$opt_stress_suite, 'stress-threads=i' => \$opt_stress_threads, @@ -655,7 +655,7 @@ sub command_line_setup () { $glob_mysql_test_dir= `cygpath -m "$glob_mysql_test_dir"`; chomp($glob_mysql_test_dir); } - if (defined $ENV{MTR_BINDIR}) + if (defined $ENV{MTR_BINDIR}) { $default_vardir= "$ENV{MTR_BINDIR}/mysql-test/var"; } @@ -700,7 +700,7 @@ sub command_line_setup () { { my $lib_mysqld= mtr_path_exists(vs_config_dirs('libmysqld','')); - $lib_mysqld= $glob_cygwin_perl ? ":".`cygpath "$lib_mysqld"` + $lib_mysqld= $glob_cygwin_perl ? ":".`cygpath "$lib_mysqld"` : ";".$lib_mysqld; chomp($lib_mysqld); $ENV{'PATH'}="$ENV{'PATH'}".$lib_mysqld; @@ -738,7 +738,7 @@ sub command_line_setup () { "$glob_bindir/client", "$glob_bindir/bin"); } - + # Look for language files and charsetsdir, use same share $path_share= mtr_path_exists("$glob_bindir/share/mysql", "$glob_bindir/sql/share", @@ -761,8 +761,8 @@ sub command_line_setup () { "$path_client_bindir/mysqld-debug", "$path_client_bindir/mysqld-max", "$glob_bindir/libexec/mysqld", - "$glob_bindir/bin/mysqld", - "$glob_bindir/sbin/mysqld"); + "$glob_bindir/bin/mariadbd", + "$glob_bindir/sbin/mariadbd"); # Use the mysqld found above to find out what features are available collect_mysqld_features(); @@ -815,7 +815,7 @@ sub command_line_setup () { $used_binlog_format= $1; } } - if (defined $used_binlog_format) + if (defined $used_binlog_format) { mtr_report("Using binlog format '$used_binlog_format'"); } @@ -1619,7 +1619,7 @@ sub environment_setup () { $ENV{'CHARSETSDIR'}= $path_charsetsdir; $ENV{'UMASK'}= "0660"; # The octal *string* $ENV{'UMASK_DIR'}= "0770"; # The octal *string* - + # # MySQL tests can produce output in various character sets # (especially, ctype_xxx.test). To avoid confusing Perl @@ -1630,7 +1630,7 @@ sub environment_setup () { # $ENV{'LC_ALL'}= "C"; $ENV{'LC_CTYPE'}= "C"; - + $ENV{'LC_COLLATE'}= "C"; $ENV{'USE_RUNNING_SERVER'}= $opt_extern; $ENV{'MYSQL_TEST_DIR'}= $glob_mysql_test_dir; @@ -1803,7 +1803,7 @@ sub environment_setup () { $ENV{'MYSQLADMIN'}= mtr_native_path($exe_mysqladmin); # ---------------------------------------------------- - # Setup env so childs can execute perror + # Setup env so childs can execute perror # ---------------------------------------------------- $ENV{'MY_PERROR'}= mtr_native_path($exe_perror); @@ -2773,7 +2773,7 @@ sub run_testcase ($) { if ($glob_win32_perl) { #ActiveState perl hangs when using normal exit, use POSIX::_exit instead - use POSIX qw[ _exit ]; + use POSIX qw[ _exit ]; POSIX::_exit(0); } else @@ -3157,10 +3157,10 @@ sub mysqld_arguments ($$$$) { { # NOTE: the backport (see BUG#48048) originally removed the # commented out lines below. However, given that they are -# protected with a version check (< 50200) now, it should be -# safe to keep them. The problem is that the backported patch -# was into a 5.1 GA codebase - mysql-5.1-rep+2 tree - so -# version is 501XX, consequently check becomes worthless. It +# protected with a version check (< 50200) now, it should be +# safe to keep them. The problem is that the backported patch +# was into a 5.1 GA codebase - mysql-5.1-rep+2 tree - so +# version is 501XX, consequently check becomes worthless. It # should be safe to uncomment them when merging up to 5.5. # # RQG semisync test runs on the 5.1 GA tree and needs MTR v1. @@ -4322,4 +4322,3 @@ sub list_options ($) { mtr_exit(1); } - |