1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-24 06:01:25 +03:00

Merge 5.1-release branch into MariaDB trunk.

This commit is contained in:
unknown
2009-11-06 18:24:38 +01:00
3 changed files with 15 additions and 0 deletions

View File

@@ -249,6 +249,10 @@ sub collect_one_suite($)
$suitedir= my_find_dir($::basedir,
["mysql-test/suite",
"mysql-test",
"share/mysql-test/suite",
"share/mysql-test",
"share/mysql/mysql-test/suite",
"share/mysql/mysql-test",
# Look in storage engine specific suite dirs
"storage/*/mysql-test-suites"
],

View File

@@ -1000,6 +1000,12 @@ sub command_line_setup {
{
$basedir= dirname($basedir);
}
# For .deb, it's like RPM, but installed in /usr/share/mysql/mysql-test.
# So move up one more directory level yet.
if ( ! $source_dist and ! -d "$basedir/bin" )
{
$basedir= dirname($basedir);
}
# Look for the client binaries directory
if ($path_client_bindir)