diff -ruN e-smith-mysql-2.4.0.old/createlinks e-smith-mysql-2.4.0/createlinks
--- e-smith-mysql-2.4.0.old/createlinks	2008-10-06 07:29:16.000000000 -0700
+++ e-smith-mysql-2.4.0/createlinks	2014-03-17 08:14:32.000000000 -0700
@@ -49,6 +49,6 @@
 
 safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/mysqld");
 
-templates2events("/etc/e-smith/sql/init/10fix_privilege_tables", 
+templates2events("/etc/e-smith/sql/init/10mysql_upgrade", 
 	"bootstrap-console-save");
 
diff -ruN e-smith-mysql-2.4.0.old/root/etc/e-smith/templates/etc/e-smith/sql/init/00_restore_dumped_dbs e-smith-mysql-2.4.0/root/etc/e-smith/templates/etc/e-smith/sql/init/00_restore_dumped_dbs
--- e-smith-mysql-2.4.0.old/root/etc/e-smith/templates/etc/e-smith/sql/init/00_restore_dumped_dbs	2008-10-06 07:29:16.000000000 -0700
+++ e-smith-mysql-2.4.0/root/etc/e-smith/templates/etc/e-smith/sql/init/00_restore_dumped_dbs	2014-03-17 08:17:25.000000000 -0700
@@ -2,6 +2,7 @@
 
 ( cat /home/e-smith/db/mysql/mysql.dump ;
   cat /service/mysqld/set.password ) | mysql || exit 1
+/usr/bin/mysql_upgrade
 P=$(cat /var/run/mysqld/mysqld.pid)
 /bin/rm /var/run/mysqld/mysqld.pid
 kill -TERM $P
diff -ruN e-smith-mysql-2.4.0.old/root/etc/e-smith/templates/etc/e-smith/sql/init/10fix_privilege_tables e-smith-mysql-2.4.0/root/etc/e-smith/templates/etc/e-smith/sql/init/10fix_privilege_tables
--- e-smith-mysql-2.4.0.old/root/etc/e-smith/templates/etc/e-smith/sql/init/10fix_privilege_tables	2014-03-17 08:15:11.000000000 -0700
+++ e-smith-mysql-2.4.0/root/etc/e-smith/templates/etc/e-smith/sql/init/10fix_privilege_tables	1969-12-31 16:00:00.000000000 -0800
@@ -1,17 +0,0 @@
-#!/bin/sh
-/usr/bin/mysql_upgrade 
-
-P=$(cat /var/run/mysqld/mysqld.pid)
-/bin/rm /var/run/mysqld/mysqld.pid
-kill -TERM $P
-for i in $(seq 1 20);
-do
-  if [ -f /var/run/mysqld/mysqld.pid ]
-  then
-      exit 0
-  fi
-  echo waiting for mysqld to restart
-  sleep 1
-done
-echo mysqld failed to restart
-exit 1
diff -ruN e-smith-mysql-2.4.0.old/root/etc/e-smith/templates/etc/e-smith/sql/init/10mysql_upgrade e-smith-mysql-2.4.0/root/etc/e-smith/templates/etc/e-smith/sql/init/10mysql_upgrade
--- e-smith-mysql-2.4.0.old/root/etc/e-smith/templates/etc/e-smith/sql/init/10mysql_upgrade	1969-12-31 16:00:00.000000000 -0800
+++ e-smith-mysql-2.4.0/root/etc/e-smith/templates/etc/e-smith/sql/init/10mysql_upgrade	2014-03-17 08:15:11.000000000 -0700
@@ -0,0 +1,17 @@
+#!/bin/sh
+/usr/bin/mysql_upgrade 
+
+P=$(cat /var/run/mysqld/mysqld.pid)
+/bin/rm /var/run/mysqld/mysqld.pid
+kill -TERM $P
+for i in $(seq 1 20);
+do
+  if [ -f /var/run/mysqld/mysqld.pid ]
+  then
+      exit 0
+  fi
+  echo waiting for mysqld to restart
+  sleep 1
+done
+echo mysqld failed to restart
+exit 1
diff -ruN e-smith-mysql-2.4.0.old/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/10fix_privilege_tables e-smith-mysql-2.4.0/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/10fix_privilege_tables
--- e-smith-mysql-2.4.0.old/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/10fix_privilege_tables	2006-03-15 22:44:28.000000000 -0800
+++ e-smith-mysql-2.4.0/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/10fix_privilege_tables	1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-PERMS=0540
diff -ruN e-smith-mysql-2.4.0.old/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/10mysql_upgrade e-smith-mysql-2.4.0/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/10mysql_upgrade
--- e-smith-mysql-2.4.0.old/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/10mysql_upgrade	1969-12-31 16:00:00.000000000 -0800
+++ e-smith-mysql-2.4.0/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/10mysql_upgrade	2006-03-15 22:44:28.000000000 -0800
@@ -0,0 +1 @@
+PERMS=0540