bk commit into 5.0 tree (kent:1.2100) BUG#19353

[kent]

Below is the list of changes that have just been committed into a local
5.0 repository of kent. When kent does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2100 06/04/28 17:03:11 kent@stripped +1 -0
  mysql.spec.sh:
    Include and run mysql_upgrade if needed (bug#19353)

  support-files/mysql.spec.sh
    1.135 06/04/28 17:02:53 kent@stripped +10 -1
    Include and run mysql_upgrade if needed (bug#19353)

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	kent
# Host:	c-7b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root:	/Users/kent/mysql/bk/mysql-5.0-new

--- 1.134/support-files/mysql.spec.sh	2006-04-01 05:53:26 +02:00
+++ 1.135/support-files/mysql.spec.sh	2006-04-28 17:02:53 +02:00
@@ -488,9 +488,12 @@
 # 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 @@
 %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 @@
 %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 @@
 # itself - note that they must be ordered by date (important when
 # merging BK trees)
 %changelog 
+* Fri Apr 28 2006 Kent Boortz <kent@stripped>
+
+- Install and run "mysql_upgrade"
+
 * Sat Apr 01 2006 Kent Boortz <kent@stripped>
 
 - Set $LDFLAGS from $MYSQL_BUILD_LDFLAGS