database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Revert "Added --titlebar option to enable/disable the titlebar"

Browse Source 
This reverts commit c675886dcd.

The bug was introduced in e3f5789ac0 and fixed in 1af74d523a

The option was introduced between those two commits and now it's
redundant again.
This commit is contained in:
Sergei Golubchik
2020-05-13 13:42:32 +02:00
parent b30a013142
commit 3b251e24b6
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mysql-test/mysql-test-run.pl
View File

@ -365,7 +365,7 @@ my $opt_max_save_core= env_or_val(MTR_MAX_SAVE_CORE => 5);
my $opt_max_save_datadir= env_or_val(MTR_MAX_SAVE_DATADIR => 20); my $opt_max_save_datadir= env_or_val(MTR_MAX_SAVE_DATADIR => 20);
my $opt_max_test_fail= env_or_val(MTR_MAX_TEST_FAIL => 10); my $opt_max_test_fail= env_or_val(MTR_MAX_TEST_FAIL => 10);
my $opt_core_on_failure= 0; my $opt_core_on_failure= 0;
my $opt_titlebar= 0;
my $opt_parallel= $ENV{MTR_PARALLEL} || 1; my $opt_parallel= $ENV{MTR_PARALLEL} || 1;
my $opt_port_group_size = $ENV{MTR_PORT_GROUP_SIZE} || 20; my $opt_port_group_size = $ENV{MTR_PORT_GROUP_SIZE} || 20;
@ -909,7 +909,7 @@ sub run_test_server ($$$) {
delete $next->{reserved}; delete $next->{reserved};
} }
titlebar_stat(scalar(@$tests)) if $set_titlebar && $opt_titlebar; titlebar_stat(scalar(@$tests)) if $set_titlebar;
if ($next) { if ($next) {
# We don't need this any more # We don't need this any more
@ -1246,7 +1246,6 @@ sub command_line_setup {
'start-and-exit' => \$opt_start_exit, 'start-and-exit' => \$opt_start_exit,
'start' => \$opt_start, 'start' => \$opt_start,
'user-args' => \$opt_user_args, 'user-args' => \$opt_user_args,
'titlebar' => \$opt_titlebar,
'wait-all' => \$opt_wait_all, 'wait-all' => \$opt_wait_all,
'print-testcases' => \&collect_option, 'print-testcases' => \&collect_option,
'repeat=i' => \$opt_repeat, 'repeat=i' => \$opt_repeat,
@ -6505,8 +6504,6 @@ Misc options
leaves just the server running leaves just the server running
start-dirty Only start the servers (without initialization) for start-dirty Only start the servers (without initialization) for
the first specified test case the first specified test case
titlebar Enable progress stats on the windows title bar. Works
on Windows and Xterm.
user-args In combination with start* and no test name, drops user-args In combination with start* and no test name, drops
arguments to mysqld except those specified with arguments to mysqld except those specified with
--mysqld (if any) --mysqld (if any)