Commit 3986a1f8 authored by unknown's avatar unknown
Browse files

- 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
parents 5107f1ab 21fefc68

support-files/mysql.spec.sh

+3 −1
Original line number Diff line number Diff line
@@ -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>