From 30f5fa3b9d3eabc1196c82f7bd757261fcf3127e Mon Sep 17 00:00:00 2001
From: Zhang Huangbin <Zhang Huangbin@localhost>
Date: Tue, 1 Nov 2016 22:49:58 +0800
Subject: [PATCH] Fix duplicate sql table name, and don't update sql column
 'expired'.

---
 .../0-upgrade.iredmail.0.9.5.1-0.9.6.md       | 29 +++++++------------
 html/upgrade.iredmail.0.9.5.1-0.9.6.html      | 29 +++++++------------
 2 files changed, 20 insertions(+), 38 deletions(-)

diff --git a/en_US/upgrade/0-upgrade.iredmail.0.9.5.1-0.9.6.md b/en_US/upgrade/0-upgrade.iredmail.0.9.5.1-0.9.6.md
index e655440e..f2c6cf93 100644
--- a/en_US/upgrade/0-upgrade.iredmail.0.9.5.1-0.9.6.md
+++ b/en_US/upgrade/0-upgrade.iredmail.0.9.5.1-0.9.6.md
@@ -371,13 +371,11 @@ USE vmail;
 ALTER TABLE admin \
 	MODIFY passwordlastchange DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01', \
 	MODIFY created DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01', \
-	MODIFY modified DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01', \
-	MODIFY expired DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01';
+	MODIFY modified DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01';
 
-ALTER TABLE admin \
+ALTER TABLE alias \
 	MODIFY created DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01', \
-	MODIFY modified DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01', \
-	MODIFY expired DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01';
+	MODIFY modified DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01';
 
 ALTER TABLE alias_domain \
 	MODIFY created DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01', \
@@ -385,38 +383,31 @@ ALTER TABLE alias_domain \
 
 ALTER TABLE domain \
 	MODIFY created DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01', \
-	MODIFY modified DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01', \
-	MODIFY expired DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01';
+	MODIFY modified DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01';
 
 ALTER TABLE domain_admins \
 	MODIFY created DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01', \
-	MODIFY modified DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01', \
-	MODIFY expired DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01';
+	MODIFY modified DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01';
 
 ALTER TABLE mailbox \
 	MODIFY lastlogindate DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01', \
 	MODIFY passwordlastchange DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01', \
 	MODIFY created DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01', \
-	MODIFY modified DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01', \
-	MODIFY expired DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01';
+	MODIFY modified DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01';
 
 ALTER TABLE recipient_bcc_domain \
 	MODIFY created DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01', \
-	MODIFY modified DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01', \
-	MODIFY expired DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01';
+	MODIFY modified DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01';
 
 ALTER TABLE recipient_bcc_user \
 	MODIFY created DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01', \
-	MODIFY modified DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01', \
-	MODIFY expired DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01';
+	MODIFY modified DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01';
 
 ALTER TABLE sender_bcc_domain \
 	MODIFY created DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01', \
-	MODIFY modified DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01', \
-	MODIFY expired DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01';
+	MODIFY modified DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01';
 
 ALTER TABLE sender_bcc_user \
 	MODIFY created DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01', \
-	MODIFY modified DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01', \
-	MODIFY expired DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01';
+	MODIFY modified DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01';
 ```
diff --git a/html/upgrade.iredmail.0.9.5.1-0.9.6.html b/html/upgrade.iredmail.0.9.5.1-0.9.6.html
index caf6f6a9..bfd8ea31 100644
--- a/html/upgrade.iredmail.0.9.5.1-0.9.6.html
+++ b/html/upgrade.iredmail.0.9.5.1-0.9.6.html
@@ -406,13 +406,11 @@ for some SQL columns in <code>vmail</code> database.</p>
 ALTER TABLE admin \
     MODIFY passwordlastchange DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01', \
     MODIFY created DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01', \
-    MODIFY modified DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01', \
-    MODIFY expired DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01';
+    MODIFY modified DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01';
 
-ALTER TABLE admin \
+ALTER TABLE alias \
     MODIFY created DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01', \
-    MODIFY modified DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01', \
-    MODIFY expired DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01';
+    MODIFY modified DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01';
 
 ALTER TABLE alias_domain \
     MODIFY created DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01', \
@@ -420,40 +418,33 @@ ALTER TABLE alias_domain \
 
 ALTER TABLE domain \
     MODIFY created DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01', \
-    MODIFY modified DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01', \
-    MODIFY expired DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01';
+    MODIFY modified DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01';
 
 ALTER TABLE domain_admins \
     MODIFY created DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01', \
-    MODIFY modified DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01', \
-    MODIFY expired DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01';
+    MODIFY modified DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01';
 
 ALTER TABLE mailbox \
     MODIFY lastlogindate DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01', \
     MODIFY passwordlastchange DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01', \
     MODIFY created DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01', \
-    MODIFY modified DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01', \
-    MODIFY expired DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01';
+    MODIFY modified DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01';
 
 ALTER TABLE recipient_bcc_domain \
     MODIFY created DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01', \
-    MODIFY modified DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01', \
-    MODIFY expired DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01';
+    MODIFY modified DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01';
 
 ALTER TABLE recipient_bcc_user \
     MODIFY created DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01', \
-    MODIFY modified DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01', \
-    MODIFY expired DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01';
+    MODIFY modified DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01';
 
 ALTER TABLE sender_bcc_domain \
     MODIFY created DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01', \
-    MODIFY modified DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01', \
-    MODIFY expired DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01';
+    MODIFY modified DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01';
 
 ALTER TABLE sender_bcc_user \
     MODIFY created DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01', \
-    MODIFY modified DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01', \
-    MODIFY expired DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01';
+    MODIFY modified DATETIME NOT NULL DEFAULT '1970-01-01 01:01:01';
 </code></pre><div class="footer">
     <p style="text-align: center; color: grey;">All documents are available in <a href="https://bitbucket.org/zhb/iredmail-docs/src">BitBucket repository</a>, and published under <a href="http://creativecommons.org/licenses/by-nd/3.0/us/" target="_blank">Creative Commons</a> license. You can <a href="https://bitbucket.org/zhb/iredmail-docs/get/tip.tar.bz2">download the latest version</a> for offline reading. If you found something wrong, please do <a href="http://www.iredmail.org/contact.html">contact us</a> to fix it.</p>
 </div>