diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2021-06-10 13:43:52 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2021-06-11 13:02:55 +0200 |
| commit | f4943b4ace129aa4ff4374791dc81c7535679e9e (patch) | |
| tree | 2bb4e9be1c3c52ac3ef6b8a9e98c1d9c3973eb00 | |
| parent | 773ee80fabc49407578aec011889cd1a927992bf (diff) | |
| download | mariadb-git-f4943b4ace129aa4ff4374791dc81c7535679e9e.tar.gz | |
cleanup perfschema.short_options_1 test
the test tests whether short options work on the server command line
* remove 'show variables' for variables not affected by short options
* remove options, that are not short
* remove options, that cannot be tested from SQL
* in particular, -T12 doesn't affect the test output,
but cases ~30sec delay on shutdown
* use -W1 as -W2 is the default, so doesn't affect the test output
| -rw-r--r-- | mysql-test/suite/perfschema/r/short_option_1.result | 7 | ||||
| -rw-r--r-- | mysql-test/suite/perfschema/t/short_option_1-master.opt | 2 | ||||
| -rw-r--r-- | mysql-test/suite/perfschema/t/short_option_1.test | 4 |
3 files changed, 2 insertions, 11 deletions
diff --git a/mysql-test/suite/perfschema/r/short_option_1.result b/mysql-test/suite/perfschema/r/short_option_1.result index 89bdf21cecf..3582375a0a2 100644 --- a/mysql-test/suite/perfschema/r/short_option_1.result +++ b/mysql-test/suite/perfschema/r/short_option_1.result @@ -13,11 +13,6 @@ utf8mb3 show global variables like 'character_set_system'; Variable_name Value character_set_system utf8mb3 -show global variables like 'general_log'; -Variable_name Value -general_log ON -show global variables like 'new'; -Variable_name Value show global variables like 'log_warnings'; Variable_name Value -log_warnings 2 +log_warnings 1 diff --git a/mysql-test/suite/perfschema/t/short_option_1-master.opt b/mysql-test/suite/perfschema/t/short_option_1-master.opt index a9cda7a08ed..13005cd1ee4 100644 --- a/mysql-test/suite/perfschema/t/short_option_1-master.opt +++ b/mysql-test/suite/perfschema/t/short_option_1-master.opt @@ -1 +1 @@ --a -Cutf8 --collation-server=utf8_bin -T12 -W2 +-a -Cutf8 -W1 diff --git a/mysql-test/suite/perfschema/t/short_option_1.test b/mysql-test/suite/perfschema/t/short_option_1.test index 4d00c3729d8..825066830f3 100644 --- a/mysql-test/suite/perfschema/t/short_option_1.test +++ b/mysql-test/suite/perfschema/t/short_option_1.test @@ -11,8 +11,4 @@ show global variables like 'sql_mode'; select @@character_set_server; show global variables like 'character_set_system'; -show global variables like 'general_log'; - -show global variables like 'new'; - show global variables like 'log_warnings'; |