Commit 7c1807a0 authored by Otto Kekäläinen's avatar Otto Kekäläinen Committed by Daniel Black

Deb: On upgrades, stop both mysqld and mariadbd for backwards compat

parent b8031e36
...@@ -18,9 +18,12 @@ stop_server() { ...@@ -18,9 +18,12 @@ stop_server() {
# Return immediately if there are no mysql processes running # Return immediately if there are no mysql processes running
# as there is no point in trying to shutdown in that case. # as there is no point in trying to shutdown in that case.
if ! pgrep -x mariadbd > /dev/null; then return; fi if ! pgrep -x mariadbd > /dev/null; then return; fi
# Compatibility with versions that ran 'mysqld'
if ! pgrep -x mysqld > /dev/null; then return; fi
set +e set +e
invoke-rc.d mariadb stop invoke-rc.d mariadb stop
invoke-rc.d mysql stop # Backwards compatibility
errno=$? errno=$?
set -e set -e
......
...@@ -31,9 +31,12 @@ stop_server() { ...@@ -31,9 +31,12 @@ stop_server() {
# Return immediately if there are no mysql processes running # Return immediately if there are no mysql processes running
# as there is no point in trying to shutdown in that case. # as there is no point in trying to shutdown in that case.
if ! pgrep -x --ns $$ mariadbd > /dev/null; then return; fi if ! pgrep -x --ns $$ mariadbd > /dev/null; then return; fi
# Compatibility with versions that ran 'mysqld'
if ! pgrep -x --ns $$ mysqld > /dev/null; then return; fi
set +e set +e
invoke-rc.d mariadb stop invoke-rc.d mariadb stop
invoke-rc.d mysql stop # Backwards compatibility
errno=$? errno=$?
set -e set -e
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment