Drop the unique key from short and sync changes between v0.4-to-v0.5.sql

and our main schema.

Author: proditis

schema/00_echofish-schema.sql

@@ -382,9 +382,10 @@ CREATE TABLE `host` (
 	id int unsigned primary key auto_increment,
 	ip int unsigned default 0,
 	fqdn varchar(255) NOT NULL,
-	short varchar(50) unique,
+	short varchar(50),
 	description text,
-	unique key `host_details` (fqdn,short,ip)
+	KEY (`short`),
+	UNIQUE KEY `host_details` (`short`,`fqdn`,`ip`)
 ) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 DROP TABLE IF EXISTS `trail`;

schema/updates/v0.4-to-v0.5.sql

@@ -15,8 +15,9 @@ ALTER TABLE `syslog` CHANGE `host` `host` INT UNSIGNED NOT NULL ;
 
 ALTER TABLE `host` DROP PRIMARY KEY;
 ALTER TABLE `host` ADD `id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST ;
-ALTER TABLE `host` ADD UNIQUE ( `short` );
-ALTER TABLE `host` ADD UNIQUE key `host_details` (`fqdn`,`short`,`ip`);
+DROP INDEX `short` ON `host`; /* This is meant for the unique index */
+CREATE INDEX `short` on `host`(`short`);
+CREATE UNIQUE INDEX `host_details` ON `host`(`fqdn`,`short`,`ip`);
 
 UPDATE `syslog` as t1 LEFT JOIN host as t2 ON t1.host=t2.ip SET t1.host=t2.id; 
 UPDATE `archive` as t1 LEFT JOIN host as t2 ON t1.host=t2.ip SET t1.host=t2.id;