From 6685333bd33f3ce259136c4c6ee6ba5c0f4c8fea Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sun, 27 Apr 2014 15:57:51 +0200
Subject: [PATCH] =?UTF-8?q?don=E2=80=98t=20abort=20upgrade=20if=20REBUILD?=
 =?UTF-8?q?=20isn=E2=80=98t=20supported?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 install.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install.php b/install.php
index 4a5a54cb..4ad8ab80 100644
--- a/install.php
+++ b/install.php
@@ -527,7 +527,7 @@ if (file_exists($config['has_installed'])) {
 				query(sprintf('ALTER TABLE ``posts_%s`` ADD `num_files` int(11) DEFAULT 0 AFTER `files`;', $board['uri'])) or error(db_error());
 				query(sprintf('UPDATE ``posts_%s`` SET `files` = CONCAT(\'[{"file":"\',`filename`,\'", "size":"\',`filesize`,\'", "width":"\',`filewidth`,\'","height":"\',`fileheight`,\'","thumbwidth":"\',`thumbwidth`,\'","thumbheight":"\',`thumbheight`,\'", "file_path":"%s\/src\/\',`filename`,\'","thumb_path":"%s\/thumb\/\',`filename`,\'"}]\') WHERE `file` IS NOT NULL', $board['uri'], $board['uri'], $board['uri'])) or error(db_error());
 				query(sprintf('ALTER TABLE ``posts_%s`` DROP COLUMN `thumb`, DROP COLUMN `thumbwidth`, DROP COLUMN `thumbheight`, DROP COLUMN `file`, DROP COLUMN `fileheight`, DROP COLUMN `filesize`, DROP COLUMN `filename`', $board['uri'])) or error(db_error());
-				query(sprintf('ALTER TABLE ``posts_%s`` REBUILD', $board['uri'])) or error(db_error());
+				query(sprintf('ALTER TABLE ``posts_%s`` REBUILD', $board['uri'])); // or error(db_error()); apparently this didn't work for my mariadb installation, let's just don't quit if it doesn't succeed
 			}
 		case false:
 			// TODO: enhance Tinyboard -> vichan upgrade path.