From 3fae9d6c260e5ec14dfb6fc65fac1adfc007c235 Mon Sep 17 00:00:00 2001
From: midoks <midoks@163.com>
Date: Wed, 6 Jul 2022 14:08:42 +0800
Subject: [PATCH] up

---
 plugins/mysql-ya/conf/my8.0.cnf           | 1 +
 plugins/mysql-ya/index.py                 | 1 +
 plugins/mysql-ya/init.d/mysql.service.tpl | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/mysql-ya/conf/my8.0.cnf b/plugins/mysql-ya/conf/my8.0.cnf
index e4acaf3db..cfb7b851b 100644
--- a/plugins/mysql-ya/conf/my8.0.cnf
+++ b/plugins/mysql-ya/conf/my8.0.cnf
@@ -6,6 +6,7 @@ socket		= {$SERVER_APP_PATH}/mysql.sock
 default-character-set = UTF8MB4
 
 [mysqld]
+pid-file = {$SERVER_APP_PATH}/data/mysql.pid
 user = mysql
 port		= 3306
 socket		= {$SERVER_APP_PATH}/mysql.sock
diff --git a/plugins/mysql-ya/index.py b/plugins/mysql-ya/index.py
index b45a7cc9a..e5cf4316b 100755
--- a/plugins/mysql-ya/index.py
+++ b/plugins/mysql-ya/index.py
@@ -319,6 +319,7 @@ def initMysql8Pwd():
 
 
 def my8cmd(version, method):
+    initDreplace(version)
     # mysql 8.0  and 5.7
     try:
         if version == '5.7':
diff --git a/plugins/mysql-ya/init.d/mysql.service.tpl b/plugins/mysql-ya/init.d/mysql.service.tpl
index a1d1e9479..8aa912c37 100644
--- a/plugins/mysql-ya/init.d/mysql.service.tpl
+++ b/plugins/mysql-ya/init.d/mysql.service.tpl
@@ -39,7 +39,7 @@ ExecStartPre=/usr/libexec/mysql-check-socket
 ExecStartPre=/usr/libexec/mysql-prepare-db-dir %n
 # Note: we set --basedir to prevent probes that might trigger SELinux alarms,
 # per bug #547485
-ExecStart=/usr/libexec/mysqld --basedir=/usr --defaults-file={$SERVER_PATH}/mysql-ya/etc/my.cnf
+ExecStart=/usr/libexec/mysqld --defaults-file={$SERVER_PATH}/mysql-ya/etc/my.cnf --basedir=/usr --user=mysql
 ExecStartPost=/usr/libexec/mysql-check-upgrade
 ExecStopPost=/usr/libexec/mysql-wait-stop