From 0ea42333d37d3eda13e8756dba9c34778f5da47d Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Fri, 18 Sep 2015 18:27:54 +0200 Subject: [PATCH] remove --default-myisam from mtr it was never doing anything anyway --- man/mysql-test-run.pl.1 | 16 ---------------- mysql-test/mysql-test-run.pl | 5 ----- 2 files changed, 21 deletions(-) diff --git a/man/mysql-test-run.pl.1 b/man/mysql-test-run.pl.1 index 91d82084606..495c0c50338 100644 --- a/man/mysql-test-run.pl.1 +++ b/man/mysql-test-run.pl.1 @@ -803,22 +803,6 @@ does not fail if Debug Sync is not compiled in\&. .sp -1 .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 .\" defaults-file option: mysql-test-run.pl \fB\-\-defaults\-file=\fR\fB\fIfile_name\fR\fR diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index d902f8645eb..8b4a48f60c1 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1083,7 +1083,6 @@ sub print_global_resfile { resfile_global("shutdown-timeout", $opt_shutdown_timeout ? 1 : 0); resfile_global("warnings", $opt_warnings ? 1 : 0); resfile_global("max-connections", $opt_max_connections); -# resfile_global("default-myisam", $opt_default_myisam ? 1 : 0); resfile_global("product", "MySQL"); # Somewhat hacky code to convert numeric version back to dot notation my $v1= int($mysql_version_id / 10000); @@ -1244,7 +1243,6 @@ sub command_line_setup { 'stop-file=s' => \$opt_stop_file, 'stop-keep-alive=i' => \$opt_stop_keep_alive, 'max-connections=i' => \$opt_max_connections, - 'default-myisam!' => \&collect_option, 'report-times' => \$opt_report_times, 'result-file' => \$opt_resfile, 'stress=s' => \$opt_stress, @@ -6638,9 +6636,6 @@ Misc options timediff With --timestamp, also print time passed since *previous* test started 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 phases of test execution. stress=ARGS Run stress test, providing options to