- re-fix (#1486474) + require MySQL 4.0.8 + add index/update in identities table

git-svn-id: https://svn.roundcube.net/trunk@3333 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 6 insertions, 4 deletions

diff --git a/roundcubemail/SQL/mysql.update.sql b/roundcubemail/SQL/mysql.update.sql
index 495b600ed..8d86867ce 100644
--- a/roundcubemail/SQL/mysql.update.sql
+++ b/roundcubemail/SQL/mysql.update.sql
@@ -69,16 +69,18 @@ ALTER TABLE `contacts` DROP FOREIGN KEY `user_id_fk_contacts`;
 ALTER TABLE `identities` DROP FOREIGN KEY `user_id_fk_identities`;
 
 ALTER TABLE `messages` ADD CONSTRAINT `user_id_fk_messages` FOREIGN KEY (`user_id`)
- REFERENCES `users`(`user_id`) /*!40008 ON DELETE CASCADE ON UPDATE CASCADE */;
+ REFERENCES `users`(`user_id`);
 ALTER TABLE `cache` ADD CONSTRAINT `user_id_fk_cache` FOREIGN KEY (`user_id`)
- REFERENCES `users`(`user_id`) /*!40008 ON DELETE CASCADE ON UPDATE CASCADE */;
+ REFERENCES `users`(`user_id`);
 ALTER TABLE `contacts` ADD CONSTRAINT `user_id_fk_contacts` FOREIGN KEY (`user_id`)
- REFERENCES `users`(`user_id`) /*!40008 ON DELETE CASCADE ON UPDATE CASCADE */;
+ REFERENCES `users`(`user_id`);
 ALTER TABLE `identities` ADD CONSTRAINT `user_id_fk_identities` FOREIGN KEY (`user_id`)
- REFERENCES `users`(`user_id`) /*!40008 ON DELETE CASCADE ON UPDATE CASCADE */;
+ REFERENCES `users`(`user_id`);
 
 ALTER TABLE `contacts` ALTER `name` SET DEFAULT '';
 ALTER TABLE `contacts` ALTER `firstname` SET DEFAULT '';
 ALTER TABLE `contacts` ALTER `surname` SET DEFAULT '';
 
+ALTER TABLE `identities` INDEX `user_identities_index` (`user_id`, `del`);
+
 /*!40014 SET FOREIGN_KEY_CHECKS=1 */;