Skip to content

M
mariadb
Commit 1df23d6f authored by Sergei Golubchik's avatar Sergei Golubchik
Browse files
Options

mtr: print a detailed warning on a uninit assignment in the [ENV] group 

spider suites: #varname is a valid syntax for a variable name, don't use it for comments
parent a1a49ec9
Show whitespace changes
Inline Side-by-side
Showing with 151 additions and 144 deletions
mysql-test/mysql-test-run.pl
View file @ 1df23d6f
......@@ -4265,11 +4265,18 @@ sub run_testcase ($$) {
#
foreach my $option ($config->options_in_group("ENV"))
{
my ($name, $val)= ($option->name(), $option->value());
# Save old value to restore it before next time
$old_env{$option->name()}= $ENV{$option->name()};
$old_env{$name}= $ENV{$name};
mtr_verbose($option->name(), "=",$option->value());
$ENV{$option->name()}= $option->value();
unless (defined $val) {
mtr_warning("Uninitialized value for ", $name,
", group [ENV], file ", $current_config_name);
} else {
mtr_verbose($name, "=", $val);
$ENV{$name}= $val;
}
}
}
......
storage/spider/mysql-test/spider/bg/my.cnf
View file @ 1df23d6f
......@@ -146,31 +146,31 @@ CHILD3_3_CHARSET= DEFAULT CHARSET=utf8
STR_SEMICOLON= ;
#The followings are setted in include/init_xxx.inc files
#MASTER_1_COMMENT_2_1
#MASTER_1_COMMENT2_2_1
#MASTER_1_COMMENT3_2_1
#MASTER_1_COMMENT4_2_1
#MASTER_1_COMMENT5_2_1
#MASTER_1_COMMENT_P_2_1
#CHILD2_1_DROP_TABLES
#CHILD2_1_CREATE_TABLES
#CHILD2_1_SELECT_TABLES
#CHILD2_1_DROP_TABLES2
#CHILD2_1_CREATE_TABLES2
#CHILD2_1_SELECT_TABLES2
#CHILD2_1_DROP_TABLES3
#CHILD2_1_CREATE_TABLES3
#CHILD2_1_SELECT_TABLES3
#CHILD2_1_DROP_TABLES4
#CHILD2_1_CREATE_TABLES4
#CHILD2_1_SELECT_TABLES4
#CHILD2_1_DROP_TABLES5
#CHILD2_1_CREATE_TABLES5
#CHILD2_1_SELECT_TABLES5
#CHILD2_1_DROP_TABLES6
#CHILD2_1_CREATE_TABLES6
#CHILD2_1_SELECT_TABLES6
#CHILD2_2_DROP_TABLES
#CHILD2_2_CREATE_TABLES
#CHILD2_2_SELECT_TABLES
#The followings are set in include/init_xxx.inc files
# MASTER_1_COMMENT_2_1
# MASTER_1_COMMENT2_2_1
# MASTER_1_COMMENT3_2_1
# MASTER_1_COMMENT4_2_1
# MASTER_1_COMMENT5_2_1
# MASTER_1_COMMENT_P_2_1
# CHILD2_1_DROP_TABLES
# CHILD2_1_CREATE_TABLES
# CHILD2_1_SELECT_TABLES
# CHILD2_1_DROP_TABLES2
# CHILD2_1_CREATE_TABLES2
# CHILD2_1_SELECT_TABLES2
# CHILD2_1_DROP_TABLES3
# CHILD2_1_CREATE_TABLES3
# CHILD2_1_SELECT_TABLES3
# CHILD2_1_DROP_TABLES4
# CHILD2_1_CREATE_TABLES4
# CHILD2_1_SELECT_TABLES4
# CHILD2_1_DROP_TABLES5
# CHILD2_1_CREATE_TABLES5
# CHILD2_1_SELECT_TABLES5
# CHILD2_1_DROP_TABLES6
# CHILD2_1_CREATE_TABLES6
# CHILD2_1_SELECT_TABLES6
# CHILD2_2_DROP_TABLES
# CHILD2_2_CREATE_TABLES
# CHILD2_2_SELECT_TABLES
storage/spider/mysql-test/spider/handler/my.cnf
View file @ 1df23d6f
......@@ -146,31 +146,31 @@ CHILD3_3_CHARSET= DEFAULT CHARSET=utf8
STR_SEMICOLON= ;
#The followings are setted in include/init_xxx.inc files
#MASTER_1_COMMENT_2_1
#MASTER_1_COMMENT2_2_1
#MASTER_1_COMMENT3_2_1
#MASTER_1_COMMENT4_2_1
#MASTER_1_COMMENT5_2_1
#MASTER_1_COMMENT_P_2_1
#CHILD2_1_DROP_TABLES
#CHILD2_1_CREATE_TABLES
#CHILD2_1_SELECT_TABLES
#CHILD2_1_DROP_TABLES2
#CHILD2_1_CREATE_TABLES2
#CHILD2_1_SELECT_TABLES2
#CHILD2_1_DROP_TABLES3
#CHILD2_1_CREATE_TABLES3
#CHILD2_1_SELECT_TABLES3
#CHILD2_1_DROP_TABLES4
#CHILD2_1_CREATE_TABLES4
#CHILD2_1_SELECT_TABLES4
#CHILD2_1_DROP_TABLES5
#CHILD2_1_CREATE_TABLES5
#CHILD2_1_SELECT_TABLES5
#CHILD2_1_DROP_TABLES6
#CHILD2_1_CREATE_TABLES6
#CHILD2_1_SELECT_TABLES6
#CHILD2_2_DROP_TABLES
#CHILD2_2_CREATE_TABLES
#CHILD2_2_SELECT_TABLES
#The followings are set in include/init_xxx.inc files
# MASTER_1_COMMENT_2_1
# MASTER_1_COMMENT2_2_1
# MASTER_1_COMMENT3_2_1
# MASTER_1_COMMENT4_2_1
# MASTER_1_COMMENT5_2_1
# MASTER_1_COMMENT_P_2_1
# CHILD2_1_DROP_TABLES
# CHILD2_1_CREATE_TABLES
# CHILD2_1_SELECT_TABLES
# CHILD2_1_DROP_TABLES2
# CHILD2_1_CREATE_TABLES2
# CHILD2_1_SELECT_TABLES2
# CHILD2_1_DROP_TABLES3
# CHILD2_1_CREATE_TABLES3
# CHILD2_1_SELECT_TABLES3
# CHILD2_1_DROP_TABLES4
# CHILD2_1_CREATE_TABLES4
# CHILD2_1_SELECT_TABLES4
# CHILD2_1_DROP_TABLES5
# CHILD2_1_CREATE_TABLES5
# CHILD2_1_SELECT_TABLES5
# CHILD2_1_DROP_TABLES6
# CHILD2_1_CREATE_TABLES6
# CHILD2_1_SELECT_TABLES6
# CHILD2_2_DROP_TABLES
# CHILD2_2_CREATE_TABLES
# CHILD2_2_SELECT_TABLES
storage/spider/mysql-test/spider/my.cnf
View file @ 1df23d6f
......@@ -147,31 +147,31 @@ CHILD3_3_CHARSET= DEFAULT CHARSET=utf8
STR_SEMICOLON= ;
#The followings are setted in include/init_xxx.inc files
#MASTER_1_COMMENT_2_1
#MASTER_1_COMMENT2_2_1
#MASTER_1_COMMENT3_2_1
#MASTER_1_COMMENT4_2_1
#MASTER_1_COMMENT5_2_1
#MASTER_1_COMMENT_P_2_1
#CHILD2_1_DROP_TABLES
#CHILD2_1_CREATE_TABLES
#CHILD2_1_SELECT_TABLES
#CHILD2_1_DROP_TABLES2
#CHILD2_1_CREATE_TABLES2
#CHILD2_1_SELECT_TABLES2
#CHILD2_1_DROP_TABLES3
#CHILD2_1_CREATE_TABLES3
#CHILD2_1_SELECT_TABLES3
#CHILD2_1_DROP_TABLES4
#CHILD2_1_CREATE_TABLES4
#CHILD2_1_SELECT_TABLES4
#CHILD2_1_DROP_TABLES5
#CHILD2_1_CREATE_TABLES5
#CHILD2_1_SELECT_TABLES5
#CHILD2_1_DROP_TABLES6
#CHILD2_1_CREATE_TABLES6
#CHILD2_1_SELECT_TABLES6
#CHILD2_2_DROP_TABLES
#CHILD2_2_CREATE_TABLES
#CHILD2_2_SELECT_TABLES
#The followings are set in include/init_xxx.inc files
# MASTER_1_COMMENT_2_1
# MASTER_1_COMMENT2_2_1
# MASTER_1_COMMENT3_2_1
# MASTER_1_COMMENT4_2_1
# MASTER_1_COMMENT5_2_1
# MASTER_1_COMMENT_P_2_1
# CHILD2_1_DROP_TABLES
# CHILD2_1_CREATE_TABLES
# CHILD2_1_SELECT_TABLES
# CHILD2_1_DROP_TABLES2
# CHILD2_1_CREATE_TABLES2
# CHILD2_1_SELECT_TABLES2
# CHILD2_1_DROP_TABLES3
# CHILD2_1_CREATE_TABLES3
# CHILD2_1_SELECT_TABLES3
# CHILD2_1_DROP_TABLES4
# CHILD2_1_CREATE_TABLES4
# CHILD2_1_SELECT_TABLES4
# CHILD2_1_DROP_TABLES5
# CHILD2_1_CREATE_TABLES5
# CHILD2_1_SELECT_TABLES5
# CHILD2_1_DROP_TABLES6
# CHILD2_1_CREATE_TABLES6
# CHILD2_1_SELECT_TABLES6
# CHILD2_2_DROP_TABLES
# CHILD2_2_CREATE_TABLES
# CHILD2_2_SELECT_TABLES
storage/spider/mysql-test/spider/oracle/my.cnf
View file @ 1df23d6f
......@@ -116,31 +116,31 @@ ORACLE_DATABASE= SYSTEM
STR_SEMICOLON= ;
#The followings are setted in include/init_xxx.inc files
#MASTER_1_COMMENT_2_1
#MASTER_1_COMMENT2_2_1
#MASTER_1_COMMENT3_2_1
#MASTER_1_COMMENT4_2_1
#MASTER_1_COMMENT5_2_1
#MASTER_1_COMMENT_P_2_1
#CHILD2_1_DROP_TABLES
#CHILD2_1_CREATE_TABLES
#CHILD2_1_SELECT_TABLES
#CHILD2_1_DROP_TABLES2
#CHILD2_1_CREATE_TABLES2
#CHILD2_1_SELECT_TABLES2
#CHILD2_1_DROP_TABLES3
#CHILD2_1_CREATE_TABLES3
#CHILD2_1_SELECT_TABLES3
#CHILD2_1_DROP_TABLES4
#CHILD2_1_CREATE_TABLES4
#CHILD2_1_SELECT_TABLES4
#CHILD2_1_DROP_TABLES5
#CHILD2_1_CREATE_TABLES5
#CHILD2_1_SELECT_TABLES5
#CHILD2_1_DROP_TABLES6
#CHILD2_1_CREATE_TABLES6
#CHILD2_1_SELECT_TABLES6
#CHILD2_2_DROP_TABLES
#CHILD2_2_CREATE_TABLES
#CHILD2_2_SELECT_TABLES
#The followings are set in include/init_xxx.inc files
# MASTER_1_COMMENT_2_1
# MASTER_1_COMMENT2_2_1
# MASTER_1_COMMENT3_2_1
# MASTER_1_COMMENT4_2_1
# MASTER_1_COMMENT5_2_1
# MASTER_1_COMMENT_P_2_1
# CHILD2_1_DROP_TABLES
# CHILD2_1_CREATE_TABLES
# CHILD2_1_SELECT_TABLES
# CHILD2_1_DROP_TABLES2
# CHILD2_1_CREATE_TABLES2
# CHILD2_1_SELECT_TABLES2
# CHILD2_1_DROP_TABLES3
# CHILD2_1_CREATE_TABLES3
# CHILD2_1_SELECT_TABLES3
# CHILD2_1_DROP_TABLES4
# CHILD2_1_CREATE_TABLES4
# CHILD2_1_SELECT_TABLES4
# CHILD2_1_DROP_TABLES5
# CHILD2_1_CREATE_TABLES5
# CHILD2_1_SELECT_TABLES5
# CHILD2_1_DROP_TABLES6
# CHILD2_1_CREATE_TABLES6
# CHILD2_1_SELECT_TABLES6
# CHILD2_2_DROP_TABLES
# CHILD2_2_CREATE_TABLES
# CHILD2_2_SELECT_TABLES
storage/spider/mysql-test/spider/oracle2/my.cnf
View file @ 1df23d6f
......@@ -116,31 +116,31 @@ ORACLE_DATABASE= SYSTEM
STR_SEMICOLON= ;
#The followings are setted in include/init_xxx.inc files
#MASTER_1_COMMENT_2_1
#MASTER_1_COMMENT2_2_1
#MASTER_1_COMMENT3_2_1
#MASTER_1_COMMENT4_2_1
#MASTER_1_COMMENT5_2_1
#MASTER_1_COMMENT_P_2_1
#CHILD2_1_DROP_TABLES
#CHILD2_1_CREATE_TABLES
#CHILD2_1_SELECT_TABLES
#CHILD2_1_DROP_TABLES2
#CHILD2_1_CREATE_TABLES2
#CHILD2_1_SELECT_TABLES2
#CHILD2_1_DROP_TABLES3
#CHILD2_1_CREATE_TABLES3
#CHILD2_1_SELECT_TABLES3
#CHILD2_1_DROP_TABLES4
#CHILD2_1_CREATE_TABLES4
#CHILD2_1_SELECT_TABLES4
#CHILD2_1_DROP_TABLES5
#CHILD2_1_CREATE_TABLES5
#CHILD2_1_SELECT_TABLES5
#CHILD2_1_DROP_TABLES6
#CHILD2_1_CREATE_TABLES6
#CHILD2_1_SELECT_TABLES6
#CHILD2_2_DROP_TABLES
#CHILD2_2_CREATE_TABLES
#CHILD2_2_SELECT_TABLES
#The followings are set in include/init_xxx.inc files
# MASTER_1_COMMENT_2_1
# MASTER_1_COMMENT2_2_1
# MASTER_1_COMMENT3_2_1
# MASTER_1_COMMENT4_2_1
# MASTER_1_COMMENT5_2_1
# MASTER_1_COMMENT_P_2_1
# CHILD2_1_DROP_TABLES
# CHILD2_1_CREATE_TABLES
# CHILD2_1_SELECT_TABLES
# CHILD2_1_DROP_TABLES2
# CHILD2_1_CREATE_TABLES2
# CHILD2_1_SELECT_TABLES2
# CHILD2_1_DROP_TABLES3
# CHILD2_1_CREATE_TABLES3
# CHILD2_1_SELECT_TABLES3
# CHILD2_1_DROP_TABLES4
# CHILD2_1_CREATE_TABLES4
# CHILD2_1_SELECT_TABLES4
# CHILD2_1_DROP_TABLES5
# CHILD2_1_CREATE_TABLES5
# CHILD2_1_SELECT_TABLES5
# CHILD2_1_DROP_TABLES6
# CHILD2_1_CREATE_TABLES6
# CHILD2_1_SELECT_TABLES6
# CHILD2_2_DROP_TABLES
# CHILD2_2_CREATE_TABLES
# CHILD2_2_SELECT_TABLES
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7