aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install/database_update.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-07-08 18:26:00 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-07-08 18:26:00 +0000
commit3874d31ef04fc2962949e858642e27d32f325474 (patch)
tree5880b4431a578d46a85865fff29a795941055a17 /phpBB/install/database_update.php
parentbb7d2f7aad82d8a369d1fe0f5e32aa528bd4367b (diff)
downloadforums-3874d31ef04fc2962949e858642e27d32f325474.tar
forums-3874d31ef04fc2962949e858642e27d32f325474.tar.gz
forums-3874d31ef04fc2962949e858642e27d32f325474.tar.bz2
forums-3874d31ef04fc2962949e858642e27d32f325474.tar.xz
forums-3874d31ef04fc2962949e858642e27d32f325474.zip
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
Diffstat (limited to 'phpBB/install/database_update.php')
-rw-r--r--phpBB/install/database_update.php8
1 files 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);