Remmove redundant indexes from gmysqlbackend default schema

Based on the work of @aj-gh in pull #4809

diff --git a/modules/gmysqlbackend/3.4.0_to_4.1.0_schema.mysql.sql b/modules/gmysqlbackend/3.4.0_to_4.1.0_schema.mysql.sql
index c622245442f0dba343dfc6a6d841a6d0562fc50e..108b36c94287af38876af423b87ff19a069a116e 100644 (file)
--- a/modules/gmysqlbackend/3.4.0_to_4.1.0_schema.mysql.sql
+++ b/modules/gmysqlbackend/3.4.0_to_4.1.0_schema.mysql.sql
@@ -3,6 +3,8 @@ ALTER TABLE domains CHARACTER SET 'latin1';
 
 ALTER TABLE records MODIFY id BIGINT AUTO_INCREMENT;
 ALTER TABLE records CHARACTER SET 'latin1';
+CREATE INDEX ordername ON records (ordername);
+DROP INDEX recordorder ON records;
 
 ALTER TABLE supermasters MODIFY account VARCHAR(40) CHARACTER SET 'utf8' NOT NULL;
 ALTER TABLE supermasters CHARACTER SET 'latin1';
@@ -10,6 +12,7 @@ ALTER TABLE supermasters CHARACTER SET 'latin1';
 ALTER TABLE comments MODIFY account VARCHAR(40) CHARACTER SET 'utf8' DEFAULT NULL;
 ALTER TABLE comments MODIFY comment TEXT CHARACTER SET 'utf8' NOT NULL;
 ALTER TABLE comments CHARACTER SET 'latin1';
+DROP INDEX comments_domain_id_idx ON comments;
 
 ALTER TABLE domainmetadata CHARACTER SET 'latin1';
 

diff --git a/modules/gmysqlbackend/schema.mysql.sql b/modules/gmysqlbackend/schema.mysql.sql
index 4dcc71fc4317a623fa3d2fd6a782725b9da10a5a..bf15329b90aa3a9b626be66ba9f557594f916cf4 100644 (file)
--- a/modules/gmysqlbackend/schema.mysql.sql
+++ b/modules/gmysqlbackend/schema.mysql.sql
@@ -29,7 +29,7 @@ CREATE TABLE records (
 
 CREATE INDEX nametype_index ON records(name,type);
 CREATE INDEX domain_id ON records(domain_id);
-CREATE INDEX recordorder ON records (domain_id, ordername);
+CREATE INDEX ordername ON records (ordername);
 
 
 CREATE TABLE supermasters (
@@ -51,7 +51,6 @@ CREATE TABLE comments (
   PRIMARY KEY (id)
 ) Engine=InnoDB CHARACTER SET 'latin1';
 
-CREATE INDEX comments_domain_id_idx ON comments (domain_id);
 CREATE INDEX comments_name_type_idx ON comments (name, type);
 CREATE INDEX comments_order_idx ON comments (domain_id, modified_at);