mirror of
https://github.com/MariaDB/server.git
synced 2025-01-26 00:34:18 +01:00
Merge 11.0 into 11.1
This commit is contained in:
commit
f6c5e917e0
4 changed files with 14 additions and 5 deletions
6
debian/autobake-deb.sh
vendored
6
debian/autobake-deb.sh
vendored
|
@ -201,7 +201,11 @@ then
|
|||
for package in *.deb
|
||||
do
|
||||
echo "$package" | cut -d '_' -f 1
|
||||
dpkg-deb -c "$package" | awk '{print $1 " " $2 " " $6 " " $7 " " $8}' | sort -k 3
|
||||
# shellcheck disable=SC2034
|
||||
dpkg-deb -c "$package" | while IFS=" " read -r col1 col2 col3 col4 col5 col6 col7 col8
|
||||
do
|
||||
echo "$col1 $col2 $col6 $col7 $col8" | sort -k 3
|
||||
done
|
||||
echo "------------------------------------------------"
|
||||
done
|
||||
fi
|
||||
|
|
5
debian/mariadb-server.mariadb.init
vendored
5
debian/mariadb-server.mariadb.init
vendored
|
@ -84,7 +84,10 @@ sanity_checks() {
|
|||
|
||||
# check for diskspace shortage
|
||||
datadir=`mariadbd_get_param datadir`
|
||||
if LC_ALL=C BLOCKSIZE= df --portability $datadir/. | tail -n 1 | awk '{ exit ($4>4096) }'; then
|
||||
# As preset blocksize of GNU df is 1024 then available bytes is $df_available_blocks * 1024
|
||||
# 4096 blocks is then lower than 4 MB
|
||||
df_available_blocks=`LC_ALL=C BLOCKSIZE= df --output=avail "$datadir" | tail -n 1`
|
||||
if [ "$df_available_blocks" -lt "4096" ]; then
|
||||
log_failure_msg "$0: ERROR: The partition with $datadir is too full!"
|
||||
echo "ERROR: The partition with $datadir is too full!" | $ERR_LOGGER
|
||||
exit 1
|
||||
|
|
6
debian/mariadb-server.preinst
vendored
6
debian/mariadb-server.preinst
vendored
|
@ -196,8 +196,10 @@ if [ ! -d $mysql_datadir ] && [ ! -L $mysql_datadir ]; then
|
|||
mkdir -Z $mysql_datadir
|
||||
fi
|
||||
|
||||
# checking disc space
|
||||
if LC_ALL=C BLOCKSIZE= df --portability $mysql_datadir/. | tail -n 1 | awk '{ exit ($4>1000) }'; then
|
||||
# As preset blocksize of GNU df is 1024 then available bytes is $df_available_blocks * 1024
|
||||
# 4096 blocks is then lower than 4 MB
|
||||
df_available_blocks=`LC_ALL=C BLOCKSIZE= df --output=avail "$datadir" | tail -n 1`
|
||||
if [ "$df_available_blocks" -lt "4096" ]; then
|
||||
echo "ERROR: There's not enough space in $mysql_datadir/" 1>&2
|
||||
db_stop
|
||||
exit 1
|
||||
|
|
|
@ -476,7 +476,7 @@ fi
|
|||
|
||||
if test "$ip_only" -eq 1
|
||||
then
|
||||
hostname=`echo "$resolved" | awk '/ /{print $6}'`
|
||||
hostname=`echo "$resolved" | while read a; do echo ${a##* }; done`
|
||||
fi
|
||||
|
||||
# Create database directories
|
||||
|
|
Loading…
Add table
Reference in a new issue