Merge mysql.com:/space/my/mysql-4.1-build

into mysql.com:/space/my/mysql-5.0-build


sql/ha_innodb.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged

support-files/mysql.spec.sh

@@ -299,7 +299,7 @@ BuildMySQL "--enable-shared \
 		--with-berkeley-db \
 		--with-innodb \
 		--with-ndbcluster \
-		--with-archive \
+		--with-archive-storage-engine \
 		--with-csv-storage-engine \
 		--with-example-storage-engine \
 		--with-blackhole-storage-engine \
@@ -442,7 +442,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
@@ -668,6 +668,12 @@ fi
 # itself - note that they must be ordered by date (important when
 # merging BK trees)
 %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>
 
 - Fixed the Requires: tag for the server RPM (BUG 12233)