diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-10-04 19:22:41 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-10-04 19:22:41 +0200 |
| commit | 1f054f01b6c05eac62f7ba9168eca299d1a5a7e7 (patch) | |
| tree | 49ce868e8b3bee3efc5aad4a8c71a4896a560f8c /mysql-test | |
| parent | e8fae25e6b60c1ef6ac9be1295478747d1f15115 (diff) | |
| parent | 4ce742f01720862037d3bdd5b2f6286f89b6552d (diff) | |
| download | mariadb-git-1f054f01b6c05eac62f7ba9168eca299d1a5a7e7.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
into neptunus.(none):/home/msvensson/mysql/same_tools/my51-same_tools
mysql-test/mysql-test-run.pl:
Auto merged
Diffstat (limited to 'mysql-test')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 3ad083dbd0c..1305d9d59e6 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1141,7 +1141,7 @@ sub check_mysqld_features () { # print out version and a list of all features and settings # my $found_variable_list_start= 0; - my $spec_file= "$opt_vardir/mysqld.spec"; + my $spec_file= "$glob_mysql_test_dir/mysqld.spec.$$"; if ( mtr_run($exe_mysqld, ["--no-defaults", "--verbose", @@ -3026,7 +3026,7 @@ sub mysqld_arguments ($$$$$) { mtr_add_arg($args, "%s--ndbcluster", $prefix); mtr_add_arg($args, "%s--ndb-connectstring=%s", $prefix, $cluster->{'connect_string'}); - if ( $mysql_version_id >= 50000 ) + if ( $mysql_version_id >= 50100 ) { mtr_add_arg($args, "%s--ndb-extra-logging", $prefix); } @@ -3104,7 +3104,7 @@ sub mysqld_arguments ($$$$$) { mtr_add_arg($args, "%s--ndbcluster", $prefix); mtr_add_arg($args, "%s--ndb-connectstring=%s", $prefix, $clusters->[$slave->[$idx]->{'cluster'}]->{'connect_string'}); - if ( $mysql_version_id >= 50000 ) + if ( $mysql_version_id >= 50100 ) { mtr_add_arg($args, "%s--ndb-extra-logging", $prefix); } |