1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove --default-myisam from mtr

Browse Source 
it was never doing anything anyway
This commit is contained in:
Sergei Golubchik 2015-09-18 18:27:54 +02:00
parent 2a9bcc6086
commit 0ea42333d3
2 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
man/mysql-test-run.pl.1
View File

@ -803,22 +803,6 @@ does not fail if Debug Sync is not compiled in\&.
.sp -1 .sp -1
.IP \(bu 2.3 .IP \(bu 2.3
.\} .\}
.\" mysql-test-run.pl: default-myisam option
.\" default-myisam option: mysql-test-run.pl
\fB\-\-default\-myisam\fR
.sp
Set default storage engine to MyISAM for non-innodb tests\&. This is
needed after switching default storage engine to InnoDB\&.
.RE
.sp
.RS 4
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
.el \{\
.sp -1
.IP \(bu 2.3
.\}
.\" mysql-test-run.pl: defaults-file option .\" mysql-test-run.pl: defaults-file option
.\" defaults-file option: mysql-test-run.pl .\" defaults-file option: mysql-test-run.pl
\fB\-\-defaults\-file=\fR\fB\fIfile_name\fR\fR \fB\-\-defaults\-file=\fR\fB\fIfile_name\fR\fR

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

@ -1083,7 +1083,6 @@ sub print_global_resfile {
resfile_global("shutdown-timeout", $opt_shutdown_timeout ? 1 : 0); resfile_global("shutdown-timeout", $opt_shutdown_timeout ? 1 : 0);
resfile_global("warnings", $opt_warnings ? 1 : 0); resfile_global("warnings", $opt_warnings ? 1 : 0);
resfile_global("max-connections", $opt_max_connections); resfile_global("max-connections", $opt_max_connections);
# resfile_global("default-myisam", $opt_default_myisam ? 1 : 0);
resfile_global("product", "MySQL"); resfile_global("product", "MySQL");
# Somewhat hacky code to convert numeric version back to dot notation # Somewhat hacky code to convert numeric version back to dot notation
my $v1= int($mysql_version_id / 10000); my $v1= int($mysql_version_id / 10000);
@ -1244,7 +1243,6 @@ sub command_line_setup {
'stop-file=s' => \$opt_stop_file, 'stop-file=s' => \$opt_stop_file,
'stop-keep-alive=i' => \$opt_stop_keep_alive, 'stop-keep-alive=i' => \$opt_stop_keep_alive,
'max-connections=i' => \$opt_max_connections, 'max-connections=i' => \$opt_max_connections,
'default-myisam!' => \&collect_option,
'report-times' => \$opt_report_times, 'report-times' => \$opt_report_times,
'result-file' => \$opt_resfile, 'result-file' => \$opt_resfile,
'stress=s' => \$opt_stress, 'stress=s' => \$opt_stress,
@ -6638,9 +6636,6 @@ Misc options
timediff With --timestamp, also print time passed since timediff With --timestamp, also print time passed since
*previous* test started *previous* test started
max-connections=N Max number of open connection to server in mysqltest max-connections=N Max number of open connection to server in mysqltest
default-myisam Set default storage engine to MyISAM for non-innodb
tests. This is needed after switching default storage
engine to InnoDB.
report-times Report how much time has been spent on different report-times Report how much time has been spent on different
phases of test execution. phases of test execution.
stress=ARGS Run stress test, providing options to stress=ARGS Run stress test, providing options to