diff options
author | unknown <lenz@mysql.com> | 2005-08-04 12:35:13 +0200 |
---|---|---|
committer | unknown <lenz@mysql.com> | 2005-08-04 12:35:13 +0200 |
commit | 3986a1f86a679f09767b9352470752784434e437 (patch) | |
tree | 16903112a5cb2b12ae2b1ec6be57e85097cc42e9 /support-files | |
parent | 5107f1ab50a02c81eff36f59e8b492c9de88e9d6 (diff) | |
parent | 21fefc68cb5b9f48eea90053364d737ec022d70e (diff) | |
download | mariadb-git-3986a1f86a679f09767b9352470752784434e437.tar.gz |
- manual merge from 4.0 into 4.1: used the local version of ha_innodb.cc, merged
the rpm spec file changelog
sql/ha_innodb.cc:
- Merge: used local version (as the fix in 4.0 was a backport)
support-files/mysql.spec.sh:
- manual merge from 4.0
Diffstat (limited to 'support-files')
-rw-r--r-- | support-files/mysql.spec.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 81fed07079f..b563972e08a 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -439,7 +439,7 @@ fi # Create a MySQL user and group. Do not report any problems if it already # exists. -groupadd -r -c "MySQL server" %{mysqld_user} 2> /dev/null || true +groupadd -r %{mysqld_user} 2> /dev/null || true useradd -M -r -d $mysql_datadir -s /bin/bash -c "MySQL server" -g %{mysqld_user} %{mysqld_user} 2> /dev/null || true # Change permissions so that the user that will run the MySQL daemon @@ -670,6 +670,8 @@ fi %changelog * Thu Aug 04 2005 Lenz Grimmer <lenz@mysql.com> +- Fixed the creation of the mysql user group account in the postinstall + section (BUG 12348) - Fixed enabling the Archive storage engine in the Max binary * Tue Aug 02 2005 Lenz Grimmer <lenz@mysql.com> |