mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-01 14:30:32 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop

Browse Source 
I simply used the develop-olympus version of all files that conflicted.
Afterall there should not have been anything new in develop yet.
This commit is contained in:
Nils Adermann
2010-03-03 23:32:09 +01:00
parent b68de2323d ac32927566
commit 693a2dc99b
127 changed files with 6192 additions and 962 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
phpBB/develop/create_schema_files.php
View File

@@ -266,7 +266,8 @@ foreach ($supported_dbms as $dbms)
case 'mssql':
$line = "/*\n\n \$I" . "d: $\n\n*/\n\n";
$line .= "BEGIN TRANSACTION\nGO\n\n";
// no need to do this, no transaction support for schema changes
//$line .= "BEGIN TRANSACTION\nGO\n\n";
break;
case 'oracle':
@@ -749,7 +750,8 @@ foreach ($supported_dbms as $dbms)
switch ($dbms)
{
case 'mssql':
$line = "\nCOMMIT\nGO\n\n";
// No need to do this, no transaction support for schema changes
//$line = "\nCOMMIT\nGO\n\n";
break;
case 'sqlite':
@@ -1747,6 +1749,7 @@ function get_schema_struct()
),
'PRIMARY_KEY' => array('user_id', 'topic_id'),
'KEYS' => array(
'topic_id' => array('INDEX', 'topic_id'),
'forum_id' => array('INDEX', 'forum_id'),
),
);