From 3874d31ef04fc2962949e858642e27d32f325474 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sun, 8 Jul 2007 18:26:00 +0000
Subject: [PATCH] ok... someone messed up. We will update the packages with the
 updated database_update script.

git-svn-id: file:///svn/phpbb/trunk@7844 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/install/database_update.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index fc5851804c..f9e3b54494 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1440,8 +1440,7 @@ function sql_list_index($dbms, $table_name)
 			case 'mysql_40':
 			case 'mysql_41':
 				$sql = 'SHOW KEYS
-					FROM ' . $table_name .'
-					WHERE Non_unique = 1';
+					FROM ' . $table_name;
 				$col = 'Key_name';
 			break;
 
@@ -1461,6 +1460,11 @@ function sql_list_index($dbms, $table_name)
 		$result = $db->sql_query($sql);
 		while ($row = $db->sql_fetchrow($result))
 		{
+			if (($dbms == 'mysql_40' || $dbms == 'mysql_41') && !$row['Non_unique']))
+			{
+				continue;
+			}
+
 			$index_array[] = $row[$col];
 		}
 		$db->sql_freeresult($result);