summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Black <grooverdan@users.sourceforge.net>2018-01-13 12:27:28 +1100
committerSergei Golubchik <serg@mariadb.org>2018-07-16 18:36:28 +0200
commit8c45eb3ea51e80b429c789713fa85ef380cecdd3 (patch)
tree2c8864ed9fa3108d38be9b42f22410014e6290b6
parent2fbf2277ffec86d69f793534da7043b6dd540780 (diff)
downloadmariadb-git-8c45eb3ea51e80b429c789713fa85ef380cecdd3.tar.gz
MDEV-15050 scripts: mysql_install_db.{sh|pl}, mysqld_multi - mysqld is in @sbindir@
Closes #551
-rw-r--r--scripts/mysql_install_db.pl.in2
-rw-r--r--scripts/mysql_install_db.sh2
-rw-r--r--scripts/mysqld_multi.sh2
3 files changed, 3 insertions, 3 deletions
diff --git a/scripts/mysql_install_db.pl.in b/scripts/mysql_install_db.pl.in
index c6714f66bff..2a65dc94ba8 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 a8f32526a7e..0272a19931f 100644
--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@@ -311,7 +311,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 e96d12e3f89..8f5adfe4842 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;