mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-04 14:39:54 +00:00
mariadb: deprecate mysql* names
Fix following warnings: /usr/bin/mysql_install_db: Deprecated program name. It will be removed in a future release, use 'mariadb-install-db' instead Upstream commit [1] deprecate mysql* names, use the new name to fix above warning [1] https://github.com/MariaDB/server/commit/b30b040b733ff2045ffcd7bdd44f608c7f4912b5 Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
@@ -34,7 +34,7 @@ install_db () {
|
|||||||
[ -d "$datadir/mysql" ] && exit 0
|
[ -d "$datadir/mysql" ] && exit 0
|
||||||
|
|
||||||
# Create initial db
|
# Create initial db
|
||||||
/usr/bin/mysql_install_db --rpm --datadir="$datadir" --user=mysql
|
/usr/bin/mariadb-install-db --rpm --datadir="$datadir" --user=mysql
|
||||||
exit 0
|
exit 0
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -51,7 +51,7 @@ pinger () {
|
|||||||
|
|
||||||
while /bin/true ; do
|
while /bin/true ; do
|
||||||
sleep 1
|
sleep 1
|
||||||
mysqladmin --no-defaults --socket="$adminsocket" --user=UNKNOWN_MYSQL_USER ping >/dev/null 2>&1 && break
|
mariadb-admin --no-defaults --socket="$adminsocket" --user=UNKNOWN_MYSQL_USER ping >/dev/null 2>&1 && break
|
||||||
done
|
done
|
||||||
exit 0
|
exit 0
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ Group=mysql
|
|||||||
PermissionsStartOnly=true
|
PermissionsStartOnly=true
|
||||||
|
|
||||||
# Start main service
|
# Start main service
|
||||||
ExecStart=@BINDIR@/mysqld_safe --basedir=@PREFIX@
|
ExecStart=@BINDIR@/mariadbd-safe --basedir=@PREFIX@
|
||||||
|
|
||||||
# Don't signal startup success before a ping works
|
# Don't signal startup success before a ping works
|
||||||
ExecStartPost=@BINDIR@/mysql-systemd-start post
|
ExecStartPost=@BINDIR@/mysql-systemd-start post
|
||||||
|
|||||||
Reference in New Issue
Block a user