diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2021-08-02 10:11:41 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2021-08-02 10:11:41 +0200 |
| commit | 6efb5e9f5e3cd3ec811ae832a67e1878c14f0dea (patch) | |
| tree | b7c1a18b8bbc638ee12951d1d04db6d21bebcaed /support-files | |
| parent | 07674e6a741a82d2e30f9798f699209a6c34dfef (diff) | |
| parent | ec8882b9ddbba2f9fc3571a1ac2ade0dabf412d9 (diff) | |
| download | mariadb-git-6efb5e9f5e3cd3ec811ae832a67e1878c14f0dea.tar.gz | |
Merge branch '10.5' into 10.6
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | support-files/mysql.server.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt index 851f0394f4a..90e79954fd1 100644 --- a/support-files/CMakeLists.txt +++ b/support-files/CMakeLists.txt @@ -79,7 +79,7 @@ IF(UNIX AND NOT WITHOUT_SERVER) INSTALL(FILES ${out} DESTINATION ${inst_location}/policy/selinux COMPONENT SupportFiles) ENDFOREACH() IF(RPM) - EXECUTE_PROCESS(COMMAND rpm -q --qf "%{VERSION}-%{RELEASE}" libsepol + EXECUTE_PROCESS(COMMAND rpm -q --qf "%{VERSION}" libsepol OUTPUT_VARIABLE LIBSEPOL_VERSION RESULT_VARIABLE err) IF (NOT err) SET(CPACK_RPM_server_PACKAGE_REQUIRES diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh index cefb3225e9e..cbd6b472148 100644 --- a/support-files/mysql.server.sh +++ b/support-files/mysql.server.sh @@ -200,11 +200,11 @@ su_kill() { extra_args="" if test -r "$basedir/my.cnf" then - extra_args="-e $basedir/my.cnf" + extra_args="--defaults-extra-file= $basedir/my.cnf" else if test -r "$datadir/my.cnf" then - extra_args="-e $datadir/my.cnf" + extra_args="--defaults-extra-file= $datadir/my.cnf" fi fi |