6328e3e9fe
Update to the latest upstream version. For more details, see: https://mariadb.com/kb/en/changes-improvements-in-mariadb-109/ Added new dependency on libfmt. Following two patches dropped as the issues were fixed in upstream. * 130-c11_atomics.patch * 140-mips-connect-unaligned.patch The rest of the patches were refreshed. Don't need to disable cassandra and tokudb anymore as they were dropped from upstream tarball. Signed-off-by: Michal Hrusecky <michal@hrusecky.net>
29 lines
791 B
Diff
29 lines
791 B
Diff
--- a/scripts/mysqld_safe.sh
|
|
+++ b/scripts/mysqld_safe.sh
|
|
@@ -247,7 +247,7 @@ wsrep_recover_position() {
|
|
return 1
|
|
fi
|
|
|
|
- local wr_pidfile="$DATADIR/"`@HOSTNAME@`"-recover.pid"
|
|
+ local wr_pidfile="$DATADIR/"$(uci get 'system.@system[0].hostname')"-recover.pid"
|
|
|
|
local wr_options="--disable-log-error --pid-file='$wr_pidfile'"
|
|
|
|
@@ -669,7 +669,7 @@ then
|
|
* ) err_log="$DATADIR/$err_log" ;;
|
|
esac
|
|
else
|
|
- err_log=$DATADIR/`@HOSTNAME@`.err
|
|
+ err_log=$DATADIR/$(uci get 'system.@system[0].hostname').err
|
|
fi
|
|
fi
|
|
|
|
@@ -755,7 +755,7 @@ fi
|
|
|
|
if test -z "$pid_file"
|
|
then
|
|
- pid_file="`@HOSTNAME@`.pid"
|
|
+ pid_file="$(uci get 'system.@system[0].hostname').pid"
|
|
fi
|
|
# MariaDB wants pid file without datadir
|
|
append_arg_to_args "--pid-file=$pid_file"
|