From: Stéphane Jacob <sj@m4x.org>
Date: Fri, 15 Oct 2010 16:16:54 +0000 (+0200)
Subject: Fixes small errors in merge files.
X-Git-Tag: xorg/1.0.1~37
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=ee120a763df0ab85e0b86e7e9e1b0d216d949043;p=platal.git

Fixes small errors in merge files.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
---

diff --git a/templates/fusionax/index.tpl b/templates/fusionax/index.tpl
index 7c2ddfa..b60eb4b 100644
--- a/templates/fusionax/index.tpl
+++ b/templates/fusionax/index.tpl
@@ -39,7 +39,7 @@
 </ul>
 
 <p>
-  Une fois ces vérifications faites, un root peut lancer le script merge.php dans le répertoire upgrade/1.0.1/merge/
+  Une fois ces vérifications faites, un root peut lancer le script merge.php dans le répertoire upgrade/1.0.1/
 </p>
 
 {* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}
diff --git a/upgrade/1.0.1/15_merge_issues.sql b/upgrade/1.0.1/15_merge_issues.sql
index b96baf0..259970c 100644
--- a/upgrade/1.0.1/15_merge_issues.sql
+++ b/upgrade/1.0.1/15_merge_issues.sql
@@ -6,7 +6,8 @@ CREATE TABLE IF NOT EXISTS profile_merge_issues (
   deathdate_ax DATE DEFAULT NULL,
   name VARCHAR(255) DEFAULT NULL,
   name_type TINYINT(2) UNSIGNED DEFAULT NULL,
-  PRIMARY KEY (pid)
+  PRIMARY KEY (pid),
+  FOREIGN KEY (pid) REFERENCES profiles (pid) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB, CHARSET=utf8;
 
 -- vim:set syntax=mysql: