diff options
author | unknown <msvensson@pilot.mysql.com> | 2008-02-04 09:16:37 +0100 |
---|---|---|
committer | unknown <msvensson@pilot.mysql.com> | 2008-02-04 09:16:37 +0100 |
commit | 7b29399e02086df43e10a3f3d6407250c5d1717b (patch) | |
tree | 25a10838b4872df6eeb24f4e55b8a8575950c310 /mysql-test/lib/mtr_cases.pm | |
parent | 403ef78b7ce0b5949a0bffe44f9f808d8f6aec4c (diff) | |
parent | 136e285055c9e6ef9a060dcfcb443fedc3e41274 (diff) | |
download | mariadb-git-7b29399e02086df43e10a3f3d6407250c5d1717b.tar.gz |
Merge bk-internal:/home/bk/mysql-5.1-maint2
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr
mysql-test/lib/mtr_cases.pm:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
Diffstat (limited to 'mysql-test/lib/mtr_cases.pm')
-rw-r--r-- | mysql-test/lib/mtr_cases.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm index 9aae7c387d1..cc9323cb9fb 100644 --- a/mysql-test/lib/mtr_cases.pm +++ b/mysql-test/lib/mtr_cases.pm @@ -456,7 +456,7 @@ sub collect_one_suite($) push(@{$new_test->{master_opt}}, @{$comb->{comb_opt}}); push(@{$new_test->{slave_opt}}, @{$comb->{comb_opt}}); - # Add combination name shrt name + # Add combination name short name $new_test->{combination}= $comb->{name}; # Add the new test to new test cases list |