Skip to content
Snippets Groups Projects
Commit d0bcab44 authored by Otto Kekäläinen's avatar Otto Kekäläinen
Browse files

Ensure spaces are used everywhere instead of tabs for indentation

parent b1f1640d
No related branches found
No related tags found
1 merge request!49Sync downstream (where applicable) with upstream 10.11 debian/* contents and extend similar changes to make them complete
......@@ -89,7 +89,7 @@ mariadb (1:10.11.2-1) unstable; urgency=medium
- innodb_change_buffering
- innodb-buffer-pool-chunk-size: defaults to 0 (instead of 134217728) in
server variables because the server automatically sizes it
- keep_files_on_create: orphan files are now deleted automatically, so this
- keep_files_on_create: orphan files are now deleted automatically, so this
setting should never be needed
Note also that the MariaDB client settings have changed to now use SSL/TLS
......
......@@ -252,11 +252,11 @@ case "${1:-''}" in
;;
'bootstrap')
# Bootstrap the cluster, start the first node
# that initiates the cluster
log_daemon_msg "Bootstrapping the cluster" "mariadbd"
$SELF start "${@:2}" --wsrep-new-cluster
;;
# Bootstrap the cluster, start the first node
# that initiates the cluster
log_daemon_msg "Bootstrapping the cluster" "mariadbd"
$SELF start "${@:2}" --wsrep-new-cluster
;;
*)
echo "Usage: $SELF start|stop|restart|reload|force-reload|status"
......
......@@ -201,16 +201,16 @@ fi
# creating mysql user if he isn't already there
if ! getent passwd mysql >/dev/null
then
# Adding system user: mysql.
adduser \
--system \
# Adding system user: mysql.
adduser \
--system \
--disabled-login \
--ingroup mysql \
--no-create-home \
--home /nonexistent \
--gecos "MariaDB Server" \
--shell /bin/false \
mysql >/dev/null 2>&1
--ingroup mysql \
--no-create-home \
--home /nonexistent \
--gecos "MariaDB Server" \
--shell /bin/false \
mysql >/dev/null 2>&1
fi
# end of NIS tolerance zone
......@@ -272,7 +272,7 @@ db_stop
# $2 = 1:10.6.11-2
if [ "$1" = "upgrade" ] && [ -n "$2" ] && [ -e "/etc/init.d/mariadb" ]
then
chmod +x "/etc/init.d/mariadb" >/dev/null || true
chmod +x "/etc/init.d/mariadb" >/dev/null || true
fi
# dh_installinit/13.11.3 adds this check but with extra condition that there
......@@ -284,5 +284,5 @@ fi
# executable bit set on /etc/init.d/mariadb.
if [ "$1" = "install" ] && [ -e "/etc/init.d/mariadb" ]
then
chmod +x "/etc/init.d/mariadb" >/dev/null || true
chmod +x "/etc/init.d/mariadb" >/dev/null || true
fi
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment