From 1df23d6f0fc74bbc96d78821d19863f32355a35f Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Wed, 25 Dec 2013 10:13:15 +0100 Subject: [PATCH] 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 --- mysql-test/mysql-test-run.pl | 15 +++-- storage/spider/mysql-test/spider/bg/my.cnf | 56 +++++++++---------- .../spider/mysql-test/spider/handler/my.cnf | 56 +++++++++---------- storage/spider/mysql-test/spider/my.cnf | 56 +++++++++---------- .../spider/mysql-test/spider/oracle/my.cnf | 56 +++++++++---------- .../spider/mysql-test/spider/oracle2/my.cnf | 56 +++++++++---------- 6 files changed, 151 insertions(+), 144 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index b00ddd5f2fc..5a5f2655fda 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -4265,11 +4265,18 @@ sub run_testcase ($$) { # foreach my $option ($config->options_in_group("ENV")) { - # Save old value to restore it before next time - $old_env{$option->name()}= $ENV{$option->name()}; + my ($name, $val)= ($option->name(), $option->value()); - mtr_verbose($option->name(), "=",$option->value()); - $ENV{$option->name()}= $option->value(); + # Save old value to restore it before next time + $old_env{$name}= $ENV{$name}; + + unless (defined $val) { + mtr_warning("Uninitialized value for ", $name, + ", group [ENV], file ", $current_config_name); + } else { + mtr_verbose($name, "=", $val); + $ENV{$name}= $val; + } } } diff --git a/storage/spider/mysql-test/spider/bg/my.cnf b/storage/spider/mysql-test/spider/bg/my.cnf index 7f9d7c44c05..246099c623e 100644 --- a/storage/spider/mysql-test/spider/bg/my.cnf +++ b/storage/spider/mysql-test/spider/bg/my.cnf @@ -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 diff --git a/storage/spider/mysql-test/spider/handler/my.cnf b/storage/spider/mysql-test/spider/handler/my.cnf index 6b79d0a8f87..89b91e6a5bd 100644 --- a/storage/spider/mysql-test/spider/handler/my.cnf +++ b/storage/spider/mysql-test/spider/handler/my.cnf @@ -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 diff --git a/storage/spider/mysql-test/spider/my.cnf b/storage/spider/mysql-test/spider/my.cnf index deca681c3a3..db4f7656fbc 100644 --- a/storage/spider/mysql-test/spider/my.cnf +++ b/storage/spider/mysql-test/spider/my.cnf @@ -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 diff --git a/storage/spider/mysql-test/spider/oracle/my.cnf b/storage/spider/mysql-test/spider/oracle/my.cnf index e24985bb8d4..efa05c8e8b0 100644 --- a/storage/spider/mysql-test/spider/oracle/my.cnf +++ b/storage/spider/mysql-test/spider/oracle/my.cnf @@ -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 diff --git a/storage/spider/mysql-test/spider/oracle2/my.cnf b/storage/spider/mysql-test/spider/oracle2/my.cnf index e24985bb8d4..efa05c8e8b0 100644 --- a/storage/spider/mysql-test/spider/oracle2/my.cnf +++ b/storage/spider/mysql-test/spider/oracle2/my.cnf @@ -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