From: Michael Vogel <ike@pirati.ca>
Date: Sun, 9 Oct 2016 07:01:19 +0000 (+0000)
Subject: The creation of unique keys failed for MariaDB
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4404bf1651c7ba6602e50ffe47b6448c14b9d0e8;p=friendica.git

The creation of unique keys failed for MariaDB
---

diff --git a/boot.php b/boot.php
index 348b786e4d..f39fb0369c 100644
--- a/boot.php
+++ b/boot.php
@@ -38,7 +38,7 @@ define ( 'FRIENDICA_PLATFORM',     'Friendica');
 define ( 'FRIENDICA_CODENAME',     'Asparagus');
 define ( 'FRIENDICA_VERSION',      '3.5.1-dev' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1205      );
+define ( 'DB_UPDATE_VERSION',      1206      );
 
 /**
  * @brief Constant with a HTML line break.
diff --git a/include/dbstructure.php b/include/dbstructure.php
index d287b5e6d9..fdf09d90de 100644
--- a/include/dbstructure.php
+++ b/include/dbstructure.php
@@ -166,7 +166,8 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
 		@$db->q($sql_config);
 
 	// MySQL >= 5.7.4 doesn't support the IGNORE keyword in ALTER TABLE statements
-	if (version_compare($db->server_info(), '5.7.4') >= 0) {
+	if ((version_compare($db->server_info(), '5.7.4') >= 0) AND
+		!(strpos($db->server_info(), 'MariaDB') !== false)) {
 		$ignore = '';
 	}else {
 		$ignore = ' IGNORE';
@@ -196,7 +197,7 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
 				if ($current_index_definition != $new_index_definition && substr($indexname, 0, 6) != 'local_') {
 					$sql2=db_drop_index($indexname);
 					if ($sql3 == "")
-						$sql3 = "ALTER TABLE `".$name."` ".$sql2;
+						$sql3 = "ALTER".$ignore." TABLE `".$name."` ".$sql2;
 					else
 						$sql3 .= ", ".$sql2;
 				}
diff --git a/update.php b/update.php
index 01fa220673..7560911134 100644
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define('UPDATE_VERSION' , 1205);
+define('UPDATE_VERSION' , 1206);
 
 /**
  *
@@ -1727,4 +1727,4 @@ function update_1190() {
 function update_1202() {
 	$r = q("UPDATE `user` SET `account-type` = %d WHERE `page-flags` IN (%d, %d)",
 		dbesc(ACCOUNT_TYPE_COMMUNITY), dbesc(PAGE_COMMUNITY), dbesc(PAGE_PRVGROUP));
-}
\ No newline at end of file
+}