diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2018-07-23 11:55:18 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2018-07-23 11:55:18 +0200 |
| commit | 304440b0148e5e23ef35cea0aa00d78069bdc4e5 (patch) | |
| tree | dd1dd8de447b76cb08c9c5430c416b8cab6340d9 /scripts | |
| parent | d57ddaa1904d3c2f08460c539c72652f0c78c09a (diff) | |
| parent | 9cea4ccf12cb6e8746b9b440d9c62408a9ef04af (diff) | |
| download | mariadb-git-304440b0148e5e23ef35cea0aa00d78069bdc4e5.tar.gz | |
Merge branch '5.5' into bb-10.0-merge-sanja
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysql_install_db.pl.in | 2 | ||||
| -rw-r--r-- | scripts/mysql_install_db.sh | 2 | ||||
| -rw-r--r-- | scripts/mysqld_multi.sh | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/scripts/mysql_install_db.pl.in b/scripts/mysql_install_db.pl.in index c33fb269a3a..2103afc1e63 100644 --- a/scripts/mysql_install_db.pl.in +++ b/scripts/mysql_install_db.pl.in @@ -326,7 +326,7 @@ else $opt->{basedir} = '@prefix@'; $bindir = '@bindir@'; $extra_bindir = $bindir; - $mysqld = '@libexecdir@/mysqld'; + $mysqld = '@sbindir@/mysqld'; $pkgdatadir = '@pkgdatadir@'; $scriptdir = '@scriptdir@'; } diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh index 5300036def5..43ff4191e08 100644 --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh @@ -313,7 +313,7 @@ else basedir="@prefix@" bindir="@bindir@" resolveip="$bindir/resolveip" - mysqld="@libexecdir@/mysqld" + mysqld="@sbindir@/mysqld" pkgdatadir="@pkgdatadir@" fi diff --git a/scripts/mysqld_multi.sh b/scripts/mysqld_multi.sh index fa2743a9a9b..de8bc25afce 100644 --- a/scripts/mysqld_multi.sh +++ b/scripts/mysqld_multi.sh @@ -30,7 +30,7 @@ $opt_example = 0; $opt_help = 0; $opt_log = undef(); $opt_mysqladmin = "@bindir@/mysqladmin"; -$opt_mysqld = "@libexecdir@/mysqld"; +$opt_mysqld = "@sbindir@/mysqld"; $opt_no_log = 0; $opt_password = undef(); $opt_tcp_ip = 0; |