diff -Nur -x '*.orig' -x '*.rej' e-smith-mysql-1.12.0/root/etc/e-smith/templates/etc/e-smith/sql/init/00_restore_dumped_dbs mezzanine_patched_e-smith-mysql-1.12.0/root/etc/e-smith/templates/etc/e-smith/sql/init/00_restore_dumped_dbs
--- e-smith-mysql-1.12.0/root/etc/e-smith/templates/etc/e-smith/sql/init/00_restore_dumped_dbs	2006-03-16 17:44:28.000000000 +1100
+++ mezzanine_patched_e-smith-mysql-1.12.0/root/etc/e-smith/templates/etc/e-smith/sql/init/00_restore_dumped_dbs	2006-04-10 19:02:01.428182937 +1000
@@ -1,7 +1,6 @@
 #! /bin/sh
 
 ( cat /home/e-smith/db/mysql/mysql.dump ;
-  echo "use mysql; ALTER TABLE user MODIFY Password char(41) NOT NULL default '';" ;
   cat /service/mysqld/set.password ) | mysql
 P=$(cat /var/run/mysqld/mysqld.pid)
 /bin/rm /var/run/mysqld/mysqld.pid
diff -Nur -x '*.orig' -x '*.rej' e-smith-mysql-1.12.0/root/etc/e-smith/templates/var/service/mysqld/set.password mezzanine_patched_e-smith-mysql-1.12.0/root/etc/e-smith/templates/var/service/mysqld/set.password
--- e-smith-mysql-1.12.0/root/etc/e-smith/templates/var/service/mysqld/set.password	2006-03-16 17:44:28.000000000 +1100
+++ mezzanine_patched_e-smith-mysql-1.12.0/root/etc/e-smith/templates/var/service/mysqld/set.password	2006-04-10 19:01:44.633079180 +1000
@@ -4,6 +4,7 @@
     my $pw = esmith::util::LdapPassword();
 
     $OUT .= "use mysql;\n";
+    $OUT .= "ALTER TABLE user MODIFY Password char(41) NOT NULL default '';\n";
     $OUT .= "UPDATE user SET password=password('$pw') WHERE user='root';\n";
     $OUT .= "DELETE FROM user WHERE user='';\n";
     $OUT .= "FLUSH PRIVILEGES\n";