Merge branch 'bug-1172' into testserver-stable

1 files changed, 69 insertions, 66 deletions

diff --git a/scripts/db_migrations/version5.sh b/scripts/db_migrations/version5.sh
index 07fd354..16f4e27 100755
--- a/scripts/db_migrations/version5.sh
+++ b/scripts/db_migrations/version5.sh
@@ -58,11 +58,7 @@ mysql $mysql_opt <<- 'SQL'
 
 -- Move myISAM to InnoDB bug #1172
 
-ALTER TABLE schema_version ENGINE=INNODB;
-system echo "table schema_version altered to InnoDB"
-
-
-ALTER TABLE abuserreports ENGINE=INNODB;
+ALTER TABLE abusereports ENGINE=INNODB;
 system echo "table abusereports altered to InnoDB"
 
 
@@ -109,129 +105,136 @@ system echo "table disputedomain altered to InnoDB"
 ALTER TABLE disputeemail ENGINE=INNODB;
 system echo "table disputeemail altered to InnoDB"
 
-
-ALTER TABLE gpg  ENGINE=INNODB;
-system echo "table gpg altered to InnoDB"
-
-
-ALTER TABLE localias  ENGINE=INNODB;
-system echo "table localias altered to InnoDB"
+ALTER TABLE domaincerts  ENGINE=INNODB;
+system echo "table domainderts altered to InnoDB"
 
 
-ALTER TABLE news  ENGINE=INNODB;
-system echo "table news altered to InnoDB"
+ALTER TABLE domains ENGINE=INNODB;
+system echo "table domains altered to InnoDB"
 
 
-ALTER TABLE otphashes ENGINE=INNODB;
-system echo "table  otphashes altered to InnoDB"
+ALTER TABLE domlink  ENGINE=INNODB;
+system echo "table domlink altered to InnoDB"
 
 
-ALTER TABLE pinglog ENGINE=INNODB;
-system echo "table pinglog altered to InnoDB"
+ALTER TABLE email  ENGINE=INNODB;
+system echo "table email altered to InnoDB"
 
 
-ALTER TABLE root_certs ENGINE=INNODB;
-system echo "table root_certs altered to InnoDB"
+ALTER TABLE emailcerts  ENGINE=INNODB;
+system echo "table emailcerts altered to InnoDB"
 
 
-ALTER TABLE stampcache  ENGINE=INNODB;
-system echo "table stampcache altered to InnoDB"
+ALTER TABLE emaillink  ENGINE=INNODB;
+system echo "table emaillink altered to InnoDB"
 
 
-ALTER TABLE tickets ENGINE=INNODB;
-system echo "table tickets altered to InnoDB"
+ALTER TABLE gpg  ENGINE=INNODB;
+system echo "table gpg altered to InnoDB"
 
 
 ALTER TABLE languages ENGINE=INNODB;
 system echo "table languages altered to InnoDB"
 
 
+ALTER TABLE localias  ENGINE=INNODB;
+system echo "table localias altered to InnoDB"
+
+
 ALTER TABLE locations  ENGINE=INNODB;
 system echo "table locations altered to InnoDB"
 
 
-ALTER TABLE regions ENGINE=INNODB;
-system echo "table regions altered to InnoDB"
+ALTER TABLE news  ENGINE=INNODB;
+system echo "table news altered to InnoDB"
 
 
-ALTER TABLE domaincerts  ENGINE=INNODB;
-system echo "table domainderts altered to InnoDB"
+ALTER TABLE notary  ENGINE=INNODB;
+system echo "table notary altered to InnoDB"
 
 
-ALTER TABLE domains ENGINE=INNODB;
-system echo "table domains altered to InnoDB"
+ALTER TABLE org  ENGINE=INNODB;
+system echo "table org altered to InnoDB"
 
 
-ALTER TABLE domLink  ENGINE=INNODB;
-system echo "table domLink altered to InnoDB"
+ALTER TABLE orgadminlog  ENGINE=INNODB;
+system echo "table orgadminlog altered to InnoDB"
 
 
-ALTER TABLE emailcerts  ENGINE=INNODB;
-system echo "table emailcerts altered to InnoDB"
+ALTER TABLE orgdomaincerts  ENGINE=INNODB;
+system echo "table orgdomaincerts altered to InnoDB"
 
 
-ALTER TABLE emaillink  ENGINE=INNODB;
-system echo "table emaillink altered to InnoDB"
+ALTER TABLE orgdomains  ENGINE=INNODB;
+system echo "table orgdomains altered to InnoDB"
 
 
-ALTER TABLE email  ENGINE=INNODB;
-system echo "table email altered to InnoDB"
+ALTER TABLE orgdomlink  ENGINE=INNODB;
+system echo "table orgdomlink altered to InnoDB"
 
 
-ALTER TABLE notary  ENGINE=INNODB;
-system echo "table notary altered to InnoDB"
+ALTER TABLE orgemailcerts  ENGINE=INNODB;
+system echo "table orgemailcerts altered to InnoDB"
 
 
-ALTER TABLE tverify ENGINE=INNODB;
-system echo "table tverify altered to InnoDB"
+ALTER TABLE orgemaillink  ENGINE=INNODB;
+system echo "table orgemaillink altered to InnoDB"
 
 
-ALTER TABLE tverify-vote  ENGINE=INNODB;
-system echo "table tverify-vote altered to InnoDB"
+ALTER TABLE orginfo  ENGINE=INNODB;
+system echo "table orginfo altered to InnoDB"
 
 
-ALTER TABLE userlocations  ENGINE=INNODB;
-system echo "table userlocations altered to InnoDB"
+ALTER TABLE otphashes ENGINE=INNODB;
+system echo "table  otphashes altered to InnoDB"
 
 
-ALTER TABLE users  ENGINE=INNODB;
-system echo "table users altered to InnoDB"
+ALTER TABLE pinglog ENGINE=INNODB;
+system echo "table pinglog altered to InnoDB"
 
 
-ALTER TABLE user_agreements ENGINE=INNODB;
-system echo "table user_agreements altered to InnoDB"
+ALTER TABLE regions ENGINE=INNODB;
+system echo "table regions altered to InnoDB"
 
 
-ALTER TABLE orgdomaincerts  ENGINE=INNODB;
-system echo "table orgdomaincerts altered to InnoDB"
+ALTER TABLE root_certs ENGINE=INNODB;
+system echo "table root_certs altered to InnoDB"
 
 
-ALTER TABLE orgdomains  ENGINE=INNODB;
-system echo "table orgdomains altered to InnoDB"
+ALTER TABLE schema_version ENGINE=INNODB;
+system echo "table schema_version altered to InnoDB"
 
 
-ALTER TABLE orgdomlink  ENGINE=INNODB;
-system echo "table orgdomlink altered to InnoDB"
+ALTER TABLE stampcache  ENGINE=INNODB;
+system echo "table stampcache altered to InnoDB"
 
 
-ALTER TABLE orgemailcerts  ENGINE=INNODB;
-system echo "table orgemailcerts altered to InnoDB"
+ALTER TABLE statscache  ENGINE=INNODB;
+system echo "table statscache altered to InnoDB"
 
 
-ALTER TABLE orgemaillink  ENGINE=INNODB;
-system echo "table orgemaillink altered to InnoDB"
+ALTER TABLE tickets ENGINE=INNODB;
+system echo "table tickets altered to InnoDB"
 
 
-ALTER TABLE orginfo  ENGINE=INNODB;
-system echo "table orginfo altered to InnoDB"
+ALTER TABLE tverify ENGINE=INNODB;
+system echo "table tverify altered to InnoDB"
 
 
-ALTER TABLE org  ENGINE=INNODB;
-system echo "table org altered to InnoDB"
+ALTER TABLE tverify-vote  ENGINE=INNODB;
+system echo "table tverify-vote altered to InnoDB"
 
 
-ALTER TABLE statscache  ENGINE=INNODB;
-system echo "table statscache altered to InnoDB"
+ALTER TABLE user_agreements ENGINE=INNODB;
+system echo "table user_agreements altered to InnoDB"
+
+
+ALTER TABLE userlocations  ENGINE=INNODB;
+system echo "table userlocations altered to InnoDB"
+
+
+ALTER TABLE users  ENGINE=INNODB;
+system echo "table users altered to InnoDB"
 
 
 	-- Update schema version number