Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
9956247d
Commit
9956247d
authored
Nov 07, 2008
by
Magnus Svensson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
WL#4189 - fix for running from bin dist
parent
de500cab
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
+5
-4
mysql-test/mysql-test-run.pl
mysql-test/mysql-test-run.pl
+5
-4
No files found.
mysql-test/mysql-test-run.pl
View file @
9956247d
...
@@ -1390,7 +1390,7 @@ sub find_mysqld {
...
@@ -1390,7 +1390,7 @@ sub find_mysqld {
}
}
return
my_find_bin
(
$mysqld_basedir
,
return
my_find_bin
(
$mysqld_basedir
,
["
sql
",
"
libexec
",
"
sbin
"],
["
sql
",
"
libexec
",
"
sbin
"
,
"
bin
"
],
[
@mysqld_names
]);
[
@mysqld_names
]);
}
}
...
@@ -1420,12 +1420,12 @@ sub executable_setup () {
...
@@ -1420,12 +1420,12 @@ sub executable_setup () {
{
{
$exe_ndbd
=
$exe_ndbd
=
my_find_bin
(
$basedir
,
my_find_bin
(
$basedir
,
["
storage/ndb/src/kernel
",
"
libexec
"],
["
storage/ndb/src/kernel
",
"
libexec
"
,
"
bin
"
],
"
ndbd
");
"
ndbd
");
$exe_ndb_mgmd
=
$exe_ndb_mgmd
=
my_find_bin
(
$basedir
,
my_find_bin
(
$basedir
,
["
storage/ndb/src/mgmsrv
",
"
libexec
"],
["
storage/ndb/src/mgmsrv
",
"
libexec
"
,
"
bin
"
],
"
ndb_mgmd
");
"
ndb_mgmd
");
$exe_ndb_waiter
=
$exe_ndb_waiter
=
...
@@ -2537,7 +2537,8 @@ sub mysql_install_db {
...
@@ -2537,7 +2537,8 @@ sub mysql_install_db {
my
$bootstrap_sql_file
=
"
$opt_vardir
/tmp/bootstrap.sql
";
my
$bootstrap_sql_file
=
"
$opt_vardir
/tmp/bootstrap.sql
";
my
$path_sql
=
my_find_file
(
$install_basedir
,
my
$path_sql
=
my_find_file
(
$install_basedir
,
["
mysql
",
"
sql/share
",
"
share
",
"
scripts
"],
["
mysql
",
"
sql/share
",
"
share/mysql
",
"
share
",
"
scripts
"],
"
mysql_system_tables.sql
",
"
mysql_system_tables.sql
",
NOT_REQUIRED
);
NOT_REQUIRED
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment