Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 (e196351d) · Commits · Software / OSDI20 Artifacts / mariadb

support-files/mysql.spec.sh

+10 −1

Original line number	Diff line number	Diff line
		@@ -488,9 +488,12 @@ usermod -g %{mysqld_group} %{mysqld_user} 2> /dev/null \|\| true
		# owns all database files.
		chown -R %{mysqld_user}:%{mysqld_group} $mysql_datadir

		# Initiate databases
		# Initiate databases if needed
		%{_bindir}/mysql_install_db --rpm --user=%{mysqld_user}

		# Upgrade databases if needed
		%{_bindir}/mysql_upgrade --user=%{mysqld_user}

		# Change permissions again to fix any new files.
		chown -R %{mysqld_user}:%{mysqld_group} $mysql_datadir

		@@ -561,6 +564,7 @@ fi
		%doc %attr(644, root, man) %{_mandir}/man1/mysqld_multi.1*
		%doc %attr(644, root, man) %{_mandir}/man1/mysqld_safe.1*
		%doc %attr(644, root, man) %{_mandir}/man1/mysql_fix_privilege_tables.1*
		%doc %attr(644, root, man) %{_mandir}/man1/mysql_upgrade.1*
		%doc %attr(644, root, man) %{_mandir}/man1/mysqlhotcopy.1*
		%doc %attr(644, root, man) %{_mandir}/man1/mysqlmanager.1*
		%doc %attr(644, root, man) %{_mandir}/man1/mysql.server.1*
		@@ -585,6 +589,7 @@ fi
		%attr(755, root, root) %{_bindir}/mysql_explain_log
		%attr(755, root, root) %{_bindir}/mysql_fix_extensions
		%attr(755, root, root) %{_bindir}/mysql_fix_privilege_tables
		%attr(755, root, root) %{_bindir}/mysql_upgrade
		%attr(755, root, root) %{_bindir}/mysqlhotcopy
		%attr(755, root, root) %{_bindir}/mysql_install_db
		%attr(755, root, root) %{_bindir}/mysql_secure_installation
		@@ -724,6 +729,10 @@ fi
		# itself - note that they must be ordered by date (important when
		# merging BK trees)
		%changelog
		* Fri Apr 28 2006 Kent Boortz <kent@mysql.com>

		- Install and run "mysql_upgrade"

		* Sat Apr 01 2006 Kent Boortz <kent@mysql.com>

		- Set $LDFLAGS from $MYSQL_BUILD_LDFLAGS