Merge branch 'develop' into dist/eole/2.7.0/develop
This commit is contained in:
commit
2ba4b56d51
|
@ -14,7 +14,7 @@ if [ -e "$dc" -a -n "`fgrep mysql_upgrade $dc 2>/dev/null`" ]; then
|
||||||
else
|
else
|
||||||
pass=`perl -e 'print map{("a".."z","A".."Z",0..9)[int(rand(62))]}(1..16)'`;
|
pass=`perl -e 'print map{("a".."z","A".."Z",0..9)[int(rand(62))]}(1..16)'`;
|
||||||
if [ ! -d "$mariadb_cfdir" ]; then
|
if [ ! -d "$mariadb_cfdir" ]; then
|
||||||
then install -o 0 -g 0 -m 0755 -d $mariadb_cfdir
|
install -o 0 -g 0 -m 0755 -d $mariadb_cfdir
|
||||||
fi
|
fi
|
||||||
umask 066
|
umask 066
|
||||||
cat /dev/null > $dc
|
cat /dev/null > $dc
|
||||||
|
|
Loading…
Reference in New Issue