SF.net SVN: postfixadmin:[1521] branches/postfixadmin-2.3

[<chr...@us...>]

Revision: 1521
          http://sourceforge.net/p/postfixadmin/code/1521
Author:   christian_boltz
Date:     2013-09-12 20:07:41 +0000 (Thu, 12 Sep 2013)
Log Message:
-----------
upgrade.php:
- upgrade_318_mysql(): mark vacation_notification.notified field as
  latin1 to avoid overlong index (no upgrade function needed - if it
  broke before, upgrade.php bailed out)
  http://sourceforge.net/p/postfixadmin/discussion/676076/thread/0c919cfd/

Modified Paths:
--------------
    branches/postfixadmin-2.3/CHANGELOG.TXT
    branches/postfixadmin-2.3/upgrade.php

Modified: branches/postfixadmin-2.3/CHANGELOG.TXT
===================================================================
--- branches/postfixadmin-2.3/CHANGELOG.TXT	2013-09-12 19:55:37 UTC (rev 1520)
+++ branches/postfixadmin-2.3/CHANGELOG.TXT	2013-09-12 20:07:41 UTC (rev 1521)
@@ -16,6 +16,7 @@
   - when enabling/disabling a mailbox, also update the corresponding alias
   - fix creating superadmin in setup.php with MariaDB (more strict SQL)
   - trim() localpart in create-mailbox to avoid mailbox names with leading space
+  - mark vacation_notification.notified field as latin1 to avoid overlong index
 
 Version 2.3.6 - 2013/01/02 - SVN r1417 (postfixadmin-2.3 branch)
 ----------------------------------------------------------------

Modified: branches/postfixadmin-2.3/upgrade.php
===================================================================
--- branches/postfixadmin-2.3/upgrade.php	2013-09-12 19:55:37 UTC (rev 1520)
+++ branches/postfixadmin-2.3/upgrade.php	2013-09-12 20:07:41 UTC (rev 1521)
@@ -815,7 +815,7 @@
     db_query_parsed( "
         CREATE TABLE {IF_NOT_EXISTS} $table_vacation_notification (
             on_vacation varchar(255) {LATIN1} NOT NULL,
-            notified varchar(255) NOT NULL,
+            notified    varchar(255) {LATIN1} NOT NULL,
             notified_at timestamp NOT NULL default CURRENT_TIMESTAMP,
             PRIMARY KEY on_vacation (`on_vacation`, `notified`),
         CONSTRAINT `vacation_notification_pkey` 
@@ -827,7 +827,7 @@
 
     # in case someone has manually created the table with utf8 fields before:
     $all_sql = explode("\n", trim("
-        ALTER TABLE `$table_vacation_notification` CHANGE `notified`    `notified`    VARCHAR( 255 ) NOT NULL
+        ALTER TABLE `$table_vacation_notification` CHANGE `notified`    `notified`    VARCHAR( 255 ) {LATIN1} NOT NULL
         ALTER TABLE `$table_vacation_notification` DEFAULT CHARACTER SET utf8
     "));
     # Possible errors that can be ignored:

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.