The creation of unique keys failed for MariaDB

diff --git a/boot.php b/boot.php
index 348b786e4dfadec12a129da2ebb0bee7d162e2f9..f39fb0369cba8696d9037577f301b6fc0cd12530 100644 (file)
--- 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 d287b5e6d9b9d5c3af02677f84615c0a3d7fd95e..fdf09d90def8abd034d0801540fa02ca2ed744b4 100644 (file)
--- 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 01fa2206737b3d34ac681dbc6d02a00f30b7f2b8..756091113448a5d65078d38082ec3cf4bfb8fa8f 100644 (file)
--- 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
+}