diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2014-01-29 19:00:43 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2014-01-29 19:00:43 -0500 |
| commit | ecc2c96c9d9b0fb5d94a1203d3ffa1a2d6c036b7 (patch) | |
| tree | 3798790cf0141d8074a1c935dd9d7a9c644de0e4 /support-files | |
| parent | d2c72da610074afe95959094a11f95b29a741f29 (diff) | |
| parent | 6b6d40fa6ca1fe36f2a51c2723c58dfb3fc025bb (diff) | |
| download | mariadb-git-ecc2c96c9d9b0fb5d94a1203d3ffa1a2d6c036b7.tar.gz | |
Merge of maria/5.5 into maria-5.5-galera.
bzr merge -r tag:mariadb-5.5.35 maria/5.5
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/compiler_warnings.supp | 5 | ||||
| -rw-r--r-- | support-files/mysql.spec.sh | 5 | ||||
| -rw-r--r-- | support-files/rpm/server-postin.sh | 4 |
3 files changed, 12 insertions, 2 deletions
diff --git a/support-files/compiler_warnings.supp b/support-files/compiler_warnings.supp index cd39b3f7a9d..315af529149 100644 --- a/support-files/compiler_warnings.supp +++ b/support-files/compiler_warnings.supp @@ -161,6 +161,11 @@ include/pwdbased\.hpp: comparison of unsigned expression .*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/mysql.spec.sh b/support-files/mysql.spec.sh index 7408f682e0a..189d4bacc0e 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -1138,7 +1138,9 @@ echo "=====" >> $STATUS_HISTORY %doc release/support-files/wsrep_notify %endif +%if 0%{?commercial} %doc %attr(644, root, root) %{_infodir}/mysql.info* +%endif %doc %attr(644, root, man) %{_mandir}/man1/innochecksum.1* %doc %attr(644, root, man) %{_mandir}/man1/my_print_defaults.1* @@ -1309,6 +1311,9 @@ echo "=====" >> $STATUS_HISTORY # merging BK trees) ############################################################################## %changelog +* Wed Oct 30 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> +- Removed non gpl file docs/mysql.info from community packages + * Mon Sep 09 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - Updated logic to get the correct count of PID files 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. |