X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=update.php;h=6dd58757b9fd6830c3f843e4108ac7bbe0a60155;hb=37389795b03ae3dfaaaf78ef1017ffb61482bd89;hp=2ab2f300c04a3be538d50dc5abe3ee175e29fd88;hpb=cc9ce39e3f1d7335de2124f78c5ecb02becd197c;p=friendica.git

diff --git a/update.php b/update.php
index 2ab2f300c0..6dd58757b9 100644
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1159 );
+define( 'UPDATE_VERSION' , 1162 );
 
 /**
  *
@@ -1371,16 +1371,6 @@ ADD INDEX ( `datasize` ) ");
 }
 
 function update_1157() {
-<<<<<<< HEAD
-	$r = q("ALTER TABLE `term` ADD `aid` int(10) unsigned NOT NULL DEFAULT '0',
-		ADD `uid` int(10) unsigned NOT NULL DEFAULT '0',
-		ADD INDEX (`uid`),
-		ADD INDEX (`aid`)");
-
-	if(!$r) return UPDATE_FAILED;
-	return UPDATE_SUCCESS;
-}
-function update_1158() {
 	$r = q("CREATE TABLE  IF NOT EXISTS `dsprphotoq` (
 	  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
 	  `uid` int(11) NOT NULL,
@@ -1390,6 +1380,20 @@ function update_1158() {
 	  ) ENGINE=MyISAM DEFAULT CHARSET=utf8"
 	);
 
+	if($r)
+		return UPDATE_SUCCESS;
+}
+
+function update_1158() {
+	set_config('system', 'maintenance', 1);
+
+	// Wait for 15 seconds for current requests to
+	// clear before locking up the database
+	sleep(15);
+
+	$r = q("CREATE INDEX event_id ON item(`event-id`)");
+	set_config('system', 'maintenance', 0);
+
 	if($r)
 		return UPDATE_SUCCESS;
 
@@ -1402,13 +1406,36 @@ function update_1159() {
 		ADD INDEX (`uid`),
 		ADD INDEX (`aid`)");
 
-	if(!$r) return UPDATE_FAILED;
+	if(!$r)
+		return UPDATE_FAILED;
+
+	require_once('include/tags.php');
+	update_items();
+
 	return UPDATE_SUCCESS;
 }
 
 function update_1160() {
+	set_config('system', 'maintenance', 1);
+
+	// Wait for 15 seconds for current requests to
+	// clear before locking up the database
+	sleep(15);
+
 	$r = q("ALTER TABLE `item` ADD `mention` TINYINT(1) NOT NULL DEFAULT '0', ADD INDEX (`mention`)");
-// KEY `mention` (`mention`)
-	if(!$r) return UPDATE_FAILED;
+	set_config('system', 'maintenance', 0);
+
+	if(!$r)
+		return UPDATE_FAILED;
+
+	return UPDATE_SUCCESS;
+}
+
+function update_1161() {
+	$r = q("ALTER TABLE `pconfig` ADD INDEX (`cat`)");
+
+	if(!$r)
+		return UPDATE_FAILED;
+
 	return UPDATE_SUCCESS;
 }