diff options
| author | unknown <msvensson@pilot.mysql.com> | 2008-02-28 18:55:46 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.mysql.com> | 2008-02-28 18:55:46 +0100 |
| commit | 5435b66b9141bc095d071ba536b83c6b9ca081ec (patch) | |
| tree | ae72ed95bb9cb615544eae4769fe85a7d84440c3 /mysql-test/mysql-test-run.pl | |
| parent | 3320c165cf0c58938a5dd4ac6235b7d48030fc6c (diff) | |
| download | mariadb-git-5435b66b9141bc095d071ba536b83c6b9ca081ec.tar.gz | |
Fix after merge
mysql-test/extra/rpl_tests/rpl_charset.test:
Fix merge error
mysql-test/lib/mtr_report.pm:
Move the . out of [] to avoid log file parsing errors
mysql-test/mysql-test-run.pl:
Correct spelling of option
sql/ha_ndbcluster_binlog.cc:
Fix merge error(used "Use remote")
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 4a7fbb41d5f..1bc74016bfe 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -302,7 +302,7 @@ sub command_line_setup { 'start-from=s' => \&collect_option, 'big-test' => \$opt_big_test, 'combination=s' => \@opt_combinations, - 'skip-combination' => \&collect_option, + 'skip-combinations' => \&collect_option, 'skip-im' => \&ignore_option, |