diff options
author | Sergei Golubchik <sergii@pisem.net> | 2013-12-15 15:57:26 +0100 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2013-12-15 15:57:26 +0100 |
commit | 6bf10fac445d73fb796d4863612c87bff5f28b66 (patch) | |
tree | 4d51e193684163c21e47e9de6536cd8dae0613eb /support-files | |
parent | 8efaff4959efe32ff9bc47c1bf1710cfe9ab21b5 (diff) | |
parent | 39a8d7965d912d8fb32436735449ce04e85583d1 (diff) | |
download | mariadb-git-6bf10fac445d73fb796d4863612c87bff5f28b66.tar.gz |
5.5 merge
Diffstat (limited to 'support-files')
-rw-r--r-- | support-files/compiler_warnings.supp | 5 | ||||
-rw-r--r-- | support-files/rpm/server-postin.sh | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/support-files/compiler_warnings.supp b/support-files/compiler_warnings.supp index db8a4792fd4..ef8d68a09d2 100644 --- a/support-files/compiler_warnings.supp +++ b/support-files/compiler_warnings.supp @@ -169,6 +169,11 @@ vio/viosslfactories\.c: discards ~const~ qualifier from pointer target type .*auth_pam\.c : initialization from incompatible pointer type : 100-200 # +# jemalloc +# +jemalloc/src/jemalloc\.c: always_inline function might not be inlinable + +# # Unexplanable (?) stuff # listener.cc : .*conversion from 'SOCKET' to 'int'.* diff --git a/support-files/rpm/server-postin.sh b/support-files/rpm/server-postin.sh index b4d63815fe9..91885f73466 100644 --- a/support-files/rpm/server-postin.sh +++ b/support-files/rpm/server-postin.sh @@ -23,9 +23,9 @@ if [ $1 = 1 ] ; then # Create a MySQL user and group. Do not report any problems if it already # exists. groupadd -r %{mysqld_group} 2> /dev/null || true - useradd -M -r -d $datadir -s /bin/bash -c "MySQL server" -g %{mysqld_group} %{mysqld_user} 2> /dev/null || true + useradd -M -r --home $datadir --shell /sbin/nologin --comment "MySQL server" --gid %{mysqld_group} %{mysqld_user} 2> /dev/null || true # The user may already exist, make sure it has the proper group nevertheless (BUG#12823) - usermod -g %{mysqld_group} %{mysqld_user} 2> /dev/null || true + usermod --gid %{mysqld_group} %{mysqld_user} 2> /dev/null || true # Change permissions so that the user that will run the MySQL daemon # owns all database files. |