diff options
| author | Michael Widenius <monty@askmonty.org> | 2012-09-01 00:54:54 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2012-09-01 00:54:54 +0300 |
| commit | 1999be8d4e9d721243c51b04c76ba11ad1e9fa56 (patch) | |
| tree | cd287f49c709f844d10d774643feb5843acf99a6 /mysql-test/mysql-test-run.pl | |
| parent | 5a86a61219826aadf8d08cbc447fe438f2bf50c3 (diff) | |
| parent | b45c551ee32d0d5260f4958abf93efab1a4614a2 (diff) | |
| download | mariadb-git-1999be8d4e9d721243c51b04c76ba11ad1e9fa56.tar.gz | |
Automatic merge with 5.5
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 35d428a9681..8c4013e1c24 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1147,7 +1147,6 @@ sub command_line_setup { 'start-from=s' => \&collect_option, 'big-test+' => \$opt_big_test, 'combination=s' => \@opt_combinations, - 'skip-combinations' => \&collect_option, 'experimental=s' => \@opt_experimentals, # skip-im is deprecated and silently ignored 'skip-im' => \&ignore_option, @@ -6262,7 +6261,6 @@ Options to control what engine/variation to run all generated configs combination=<opt> Use at least twice to run tests with specified options to mysqld - skip-combinations Ignore combination file (or options) Options to control directories to use tmpdir=DIR The directory where temporary files are stored |