port 22c8194cc8

core/ajax/update.php

@@ -36,11 +36,15 @@ if (OC::checkUpgrade(false)) {
  * @param UpdateWatcher $watcher
  */
 function __doFileCacheUpgrade($watcher) {
+	try {
 		$query = \OC_DB::prepare('
 		SELECT DISTINCT `user`
 		FROM `*PREFIX*fscache`
 		');
 		$result = $query->execute();
+	} catch (\Exception $e) {
+		return;
+	}
 	$users = $result->fetchAll();
 	if(count($users) == 0) {
 		return;