From 423d560defdc95e53e0f889c4d7d83f18caec36d Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Thu, 13 Feb 2025 17:23:04 +0800 Subject: 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 Signed-off-by: Khem Raj --- meta-oe/recipes-dbs/mysql/mariadb/mysql-systemd-start | 4 ++-- meta-oe/recipes-dbs/mysql/mariadb/mysqld.service | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-oe/recipes-dbs/mysql/mariadb/mysql-systemd-start b/meta-oe/recipes-dbs/mysql/mariadb/mysql-systemd-start index 189c02021d..b7ae09a4f7 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb/mysql-systemd-start +++ b/meta-oe/recipes-dbs/mysql/mariadb/mysql-systemd-start @@ -34,7 +34,7 @@ install_db () { [ -d "$datadir/mysql" ] && exit 0 # 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 } @@ -51,7 +51,7 @@ pinger () { while /bin/true ; do 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 exit 0 } diff --git a/meta-oe/recipes-dbs/mysql/mariadb/mysqld.service b/meta-oe/recipes-dbs/mysql/mariadb/mysqld.service index d88361703d..9c47fede1c 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb/mysqld.service +++ b/meta-oe/recipes-dbs/mysql/mariadb/mysqld.service @@ -13,7 +13,7 @@ Group=mysql PermissionsStartOnly=true # Start main service -ExecStart=@BINDIR@/mysqld_safe --basedir=@PREFIX@ +ExecStart=@BINDIR@/mariadbd-safe --basedir=@PREFIX@ # Don't signal startup success before a ping works ExecStartPost=@BINDIR@/mysql-systemd-start post -- cgit v1.2.3-54-g00ecf