Skip to content

Commit

Permalink
cleanup perfschema.short_options_1 test
Browse files Browse the repository at this point in the history
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
  • Loading branch information
vuvova committed Jun 11, 2021
1 parent 773ee80 commit f4943b4
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 11 deletions.
7 changes: 1 addition & 6 deletions mysql-test/suite/perfschema/r/short_option_1.result
Expand Up @@ -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
2 changes: 1 addition & 1 deletion mysql-test/suite/perfschema/t/short_option_1-master.opt
@@ -1 +1 @@
-a -Cutf8 --collation-server=utf8_bin -T12 -W2
-a -Cutf8 -W1
4 changes: 0 additions & 4 deletions mysql-test/suite/perfschema/t/short_option_1.test
Expand Up @@ -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';

0 comments on commit f4943b4

Please sign in to comment.