In order to follow unifying the indexes and PK, this is the status of s6 for all the databases.
Normal slaves and master:
PRIMARY KEY (`rev_page`,`rev_id`), UNIQUE KEY `rev_id` (`rev_id`), KEY `rev_timestamp` (`rev_timestamp`), KEY `page_timestamp` (`rev_page`,`rev_timestamp`), KEY `user_timestamp` (`rev_user`,`rev_timestamp`), KEY `usertext_timestamp` (`rev_user_text`,`rev_timestamp`) ) ENGINE=InnoDB AUTO_INCREMENT=84013312 DEFAULT CHARSET=binary
Special rc slaves (are getting fixed already as part of: T147747) - so no need to take care of them here on this task.
In order to fix the normal slaves and the master we'd need to run:
./osc_host.sh --host=xxxx --port=3306 --db=frwiki,jawiki,ruwiki --table=revision --method=ddl --no-replicate "drop key rev_id, drop primary key, add primary key (rev_id), add key page_user_timestamp (rev_page,rev_user,rev_timestamp), add key rev_page_id (rev_page,rev_id)"