Fix #3396: Database upgrade 0.17-jf-10 failed to upgrade.

git-svn-id: http://mantisbt.svn.sourceforge.net/svnroot/mantisbt/trunk@2310 f5dc347c-c33d-0410-90a0-b07cc1902cb9

admin/upgrades/0_17_inc.php

@@ -8,7 +8,7 @@
 	# Changes applied to 0.17 database to give us ____
 
 	# --------------------------------------------------------
-	# $Id: 0_17_inc.php,v 1.8 2004-01-11 07:16:09 vboctor Exp $
+	# $Id: 0_17_inc.php,v 1.9 2004-02-06 14:07:35 jlatour Exp $
 	# --------------------------------------------------------
 ?>
 <?php
@@ -179,22 +179,22 @@ function upgrade_0_17_jf_6() {
 	$upgrades[] = new SQLUpgrade(
 		'0.17-jf-9',
 		'Add primary key on mantis_project_version_table',
-		"ALTER TABLE $t_project_version_table ADD PRIMARY KEY (project_id,version)" );
+		"ALTER IGNORE TABLE $t_project_version_table ADD PRIMARY KEY (project_id,version)" );
 
 	$upgrades[] = new SQLUpgrade(
 		'0.17-jf-10',
 		'Add primary key on mantis_project_user_list_table',
-		"ALTER TABLE $t_project_user_list_table ADD PRIMARY KEY (project_id,user_id)" );
+		"ALTER IGNORE TABLE $t_project_user_list_table ADD PRIMARY KEY (project_id,user_id)" );
 
 	$upgrades[] = new SQLUpgrade(
 		'0.17-jf-11',
 		'Add primary key on mantis_project_category_table',
-		"ALTER TABLE $t_project_category_table ADD PRIMARY KEY (project_id,category)" );
+		"ALTER IGNORE TABLE $t_project_category_table ADD PRIMARY KEY (project_id,category)" );
 
 	$upgrades[] = new SQLUpgrade(
 		'0.17-jf-12',
 		'Add primary key on mantis_bug_monitor_table',
-		"ALTER TABLE $t_bug_monitor_table ADD PRIMARY KEY (user_id,bug_id)" );
+		"ALTER IGNORE TABLE $t_bug_monitor_table ADD PRIMARY KEY (user_id,bug_id)" );
 
 	$upgrades[] = new SQLUpgrade(
 		'0.17-jf-13',
@@ -575,7 +575,7 @@ function upgrade_0_17_compat_16() {
 		$t_row = db_fetch_array( $result );
 
 		if ( 'UNI' != $t_row['Key'] ) {
-			$query = "ALTER TABLE $t_user_table
+			$query = "ALTER IGNORE TABLE $t_user_table
 						ADD UNIQUE cookie_string (cookie_string)";
 
 			$result = @db_query( $query );

doc/ChangeLog

@@ -10,6 +10,7 @@ Mantis ChangeLog
  * Fix #3177: Switching project in advanced summary changes current page.
  * Fix #3210: bug_view_advanced_page.php (and simple) doesn't show the project name.
  * Fix #3324: Win32: Call to undefined function: getmxrr() [default to OFF].
+ * Fix #3396: Database upgrade 0.17-jf-10 failed to upgrade.
  * Fix #3400: Reopen a 'closed' bug, the value of 'resolution' is 'reopen' and can't be changed (now resolution / duplicate id can be edited)
  * Sec #3445: User see all information from all projects (if user has access to 0 projects)
  * Fix #3467: Delete user ends up at user not found error.