- on database update, execute garbage_collection(). This ensures a proper closed db and written cache

- on sql errors returning (and not triggering an error) execute the rollback too

both "bugs" resulted in transactions left open if a query returned an error on database update preventing a clean update. Symptoms being for example oracle users not having all database info updated, the version number not changing or config variables not written.


git-svn-id: file:///svn/phpbb/trunk@8270 89ea8834-ac86-4346-8a33-228a782c2dd0

phpBB/includes/db/dbal.php

@@ -589,6 +589,11 @@ class dbal
 			trigger_error($message, E_USER_ERROR);
 		}
 
+		if ($this->transaction)
+		{
+			$this->sql_transaction('rollback');
+		}
+
 		return $error;
 	}
 

phpBB/install/database_update.php

@@ -1649,6 +1649,8 @@ $cache->purge();
 
 <?php
 
+garbage_collection();
+
 if (function_exists('exit_handler'))
 {
 	exit_handler();