summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <kent@kent-amd64.(none)>2007-08-06 01:35:43 +0200
committerunknown <kent@kent-amd64.(none)>2007-08-06 01:35:43 +0200
commitc4aac84439c20daa6c3cdef52cdc9bbc99907919 (patch)
tree1fa4247a71a6405b926bf6227ed09bc731154dc5
parent5809417e4045d6587812b02fd74de1f8823991e3 (diff)
parent57e225bbc4906a4540dcbdcf79e1acdefd70ebea (diff)
downloadmariadb-git-c4aac84439c20daa6c3cdef52cdc9bbc99907919.tar.gz
Merge mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build-new
into mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build-new mysql-test/mysql-test-run.pl: SCCS merged
-rwxr-xr-xmysql-test/mysql-test-run.pl2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 305c56d69cd..22b9499c37a 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -748,6 +748,7 @@ sub command_line_setup () {
if (!$opt_extern)
{
$exe_mysqld= mtr_exe_exists (vs_config_dirs('sql', 'mysqld'),
+ vs_config_dirs('sql', 'mysqld-debug'),
"$glob_basedir/sql/mysqld",
"$path_client_bindir/mysqld-max-nt",
"$path_client_bindir/mysqld-max",
@@ -2480,6 +2481,7 @@ sub vs_config_dirs ($$) {
}
return ("$glob_basedir/$path_part/release/$exe",
+ "$glob_basedir/$path_part/relwithdebinfo/$exe",
"$glob_basedir/$path_part/debug/$exe");
}