helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-09-10 21:44:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

mariadb: deprecate mysql* names

Browse Source 
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] b30b040b73

Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Changqing Li 2025-02-13 17:23:04 +08:00 committed by Khem Raj
parent 1a8e36ada3
commit 423d560def
No known key found for this signature in database
GPG Key ID: BB053355919D3314
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta-oe/recipes-dbs/mysql/mariadb/mysql-systemd-start
View File

@ -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
} }

2
meta-oe/recipes-dbs/mysql/mariadb/mysqld.service
View File

@ -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