Skip to content

Commit 0ea4233

Browse files
committed
remove --default-myisam from mtr
it was never doing anything anyway
1 parent 2a9bcc6 commit 0ea4233

File tree

2 files changed

+0
-21
lines changed

2 files changed

+0
-21
lines changed

man/mysql-test-run.pl.1

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -803,22 +803,6 @@ does not fail if Debug Sync is not compiled in\&.
803803
.sp -1
804804
.IP \(bu 2.3
805805
.\}
806-
.\" mysql-test-run.pl: default-myisam option
807-
.\" default-myisam option: mysql-test-run.pl
808-
\fB\-\-default\-myisam\fR
809-
.sp
810-
Set default storage engine to MyISAM for non-innodb tests\&. This is
811-
needed after switching default storage engine to InnoDB\&.
812-
.RE
813-
.sp
814-
.RS 4
815-
.ie n \{\
816-
\h'-04'\(bu\h'+03'\c
817-
.\}
818-
.el \{\
819-
.sp -1
820-
.IP \(bu 2.3
821-
.\}
822806
.\" mysql-test-run.pl: defaults-file option
823807
.\" defaults-file option: mysql-test-run.pl
824808
\fB\-\-defaults\-file=\fR\fB\fIfile_name\fR\fR

mysql-test/mysql-test-run.pl

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1083,7 +1083,6 @@ sub print_global_resfile {
10831083
resfile_global("shutdown-timeout", $opt_shutdown_timeout ? 1 : 0);
10841084
resfile_global("warnings", $opt_warnings ? 1 : 0);
10851085
resfile_global("max-connections", $opt_max_connections);
1086-
# resfile_global("default-myisam", $opt_default_myisam ? 1 : 0);
10871086
resfile_global("product", "MySQL");
10881087
# Somewhat hacky code to convert numeric version back to dot notation
10891088
my $v1= int($mysql_version_id / 10000);
@@ -1244,7 +1243,6 @@ sub command_line_setup {
12441243
'stop-file=s' => \$opt_stop_file,
12451244
'stop-keep-alive=i' => \$opt_stop_keep_alive,
12461245
'max-connections=i' => \$opt_max_connections,
1247-
'default-myisam!' => \&collect_option,
12481246
'report-times' => \$opt_report_times,
12491247
'result-file' => \$opt_resfile,
12501248
'stress=s' => \$opt_stress,
@@ -6638,9 +6636,6 @@ ($)
66386636
timediff With --timestamp, also print time passed since
66396637
*previous* test started
66406638
max-connections=N Max number of open connection to server in mysqltest
6641-
default-myisam Set default storage engine to MyISAM for non-innodb
6642-
tests. This is needed after switching default storage
6643-
engine to InnoDB.
66446639
report-times Report how much time has been spent on different
66456640
phases of test execution.
66466641
stress=ARGS Run stress test, providing options to

0 commit comments

Comments
 (0)