Merge remote-tracking branch 'upstream/develop' into 1612-unused-indexes

diff --combined include/dbstructure.php
index 5450c31f69d69402c5526cc887770ad6187f6a08,c694014f68fae8b11b7d952bc538b1efac9b8f56..059397d199fe371d84745db70aa706c312f14b42
--- 1/include/dbstructure.php
--- 2/include/dbstructure.php
+++ b/include/dbstructure.php
@@@ -17,6 -17,14 +17,14 @@@ function update_fail($update_id, $error
                $admin_mail_list
        );
  
+       // No valid result?
+       if (!dbm::is_result($adminlist)) {
+               logger(sprintf('Cannot notify administrators about update_id=%d, error_message=%s', $update_id, $error_message), LOGGER_WARNING);
+ 
+               // Don't continue
+               return;
+       }
+ 
        // every admin could had different language
  
        foreach ($adminlist as $admin) {
@@@ -73,7 -81,7 +81,7 @@@ function table_structure($table) 
        $fielddata = array();
        $indexdata = array();
  
-       if (is_array($indexes))
+       if (dbm::is_result($indexes))
                foreach ($indexes AS $index) {
                        if ($index["Index_type"] == "FULLTEXT")
                                continue;
@@@ -93,7 -101,7 +101,7 @@@
                        $indexdata[$index["Key_name"]][] = $column;
                }
  
-       if (is_array($structures)) {
+       if (dbm::is_result($structures)) {
                foreach($structures AS $field) {
                        $fielddata[$field["Field"]]["type"] = $field["Type"];
                        if ($field["Null"] == "NO")
@@@ -151,6 -159,7 +159,7 @@@ function update_structure($verbose, $ac
        foreach ($tables AS $table) {
                $table = current($table);
  
+               logger(sprintf('updating structure for table %s ...', $table), LOGGER_DEBUG);
                $database[$table] = table_structure($table);
        }
  
@@@ -179,7 -188,7 +188,7 @@@
                $sql3="";
                if (!isset($database[$name])) {
                        $r = db_create_table($name, $structure["fields"], $charset, $verbose, $action, $structure['indexes']);
-                       if(false === $r) {
+                       if (!dbm::is_result($r)) {
                                $errors .=  t('Errors encountered creating database tables.').$name.EOL;
                        }
                        $is_new_table = True;
@@@ -256,7 -265,7 +265,7 @@@
  
                        if ($action) {
                                $r = @$db->q($sql3);
-                               if(false === $r)
+                               if (dbm::is_result($r))
                                        $errors .= t('Errors encountered performing database changes.').$sql3.EOL;
                        }
                }
@@@ -905,24 -914,24 +914,24 @@@ function db_definition($charset) 
                                        "uid_created" => array("uid","created"),
                                        "uid_unseen_contactid" => array("uid","unseen","contact-id"),
                                        "uid_network_received" => array("uid","network","received"),
 -                                      "uid_received" => array("uid","received"),
 +                              //      "uid_received" => array("uid","received"),
                                        "uid_network_commented" => array("uid","network","commented"),
 -                                      "uid_commented" => array("uid","commented"),
 -                                      "uid_title" => array("uid","title"),
 +                              //      "uid_commented" => array("uid","commented"),
 +                              //      "uid_title" => array("uid","title"),
                                        "uid_thrparent" => array("uid","thr-parent"),
                                        "uid_parenturi" => array("uid","parent-uri"),
                                        "uid_contactid_id" => array("uid","contact-id","id"),
                                        "uid_contactid_created" => array("uid","contact-id","created"),
 -                                      "gcontactid_uid_created" => array("gcontact-id","uid","created"),
 +                              //      "gcontactid_uid_created" => array("gcontact-id","uid","created"),
                                        "authorid_created" => array("author-id","created"),
 -                                      "ownerid_created" => array("owner-id","created"),
 -                                      "wall_body" => array("wall","body(6)"),
 -                                      "uid_visible_moderated_created" => array("uid","visible","moderated","created"),
 +                              //      "ownerid_created" => array("owner-id","created"),
 +                              //      "wall_body" => array("wall","body(6)"),
 +                              //      "uid_visible_moderated_created" => array("uid","visible","moderated","created"),
                                        "uid_uri" => array("uid", "uri"),
                                        "uid_wall_created" => array("uid","wall","created"),
 -                                      "resource-id" => array("resource-id"),
 +                              //      "resource-id" => array("resource-id"),
                                        "uid_type" => array("uid","type"),
 -                                      "uid_starred_id" => array("uid","starred", "id"),
 +                              //      "uid_starred_id" => array("uid","starred", "id"),
                                        "contactid_allowcid_allowpid_denycid_denygid" => array("contact-id","allow_cid(10)","allow_gid(10)","deny_cid(10)","deny_gid(10)"),
                                        "uid_wall_parent_created" => array("uid","wall","parent","created"),
                                        "uid_type_changed" => array("uid","type","changed"),
@@@ -931,7 -940,7 +940,7 @@@
                                        "uid_wall_changed" => array("uid","wall","changed"),
                                        "uid_eventid" => array("uid","event-id"),
                                        "uid_authorlink" => array("uid","author-link"),
 -                                      "uid_ownerlink" => array("uid","owner-link"),
 +                              //      "uid_ownerlink" => array("uid","owner-link"),
                                        )
                        );
        $database["item_id"] = array(
@@@ -984,9 -993,9 +993,9 @@@
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
                                        "uid" => array("uid"),
 -                                      "guid" => array("guid"),
 -                                      "convid" => array("convid"),
 -                                      "reply" => array("reply"),
 +                              //      "guid" => array("guid"),
 +                              //      "convid" => array("convid"),
 +                              //      "reply" => array("reply"),
                                        "uri" => array("uri"),
                                        "parent-uri" => array("parent-uri"),
                                        )
@@@ -1058,7 -1067,7 +1067,7 @@@
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
                                        "master-parent-item" => array("master-parent-item"),
 -                                      "receiver-uid" => array("receiver-uid"),
 +                              //      "receiver-uid" => array("receiver-uid"),
                                        )
                        );
        $database["oembed"] = array(
@@@ -1129,7 -1138,7 +1138,7 @@@
                                        "uid_profile" => array("uid", "profile"),
                                        "uid_album_created" => array("uid", "album", "created"),
                                        "resource-id" => array("resource-id"),
 -                                      "guid" => array("guid"),
 +                              //      "guid" => array("guid"),
                                        )
                        );
        $database["poll"] = array(
@@@ -1268,7 -1277,7 +1277,7 @@@
                                        "cid" => array("cid"),
                                        "created" => array("created"),
                                        "last" => array("last"),
 -                                      "network" => array("network"),
 +                              //      "network" => array("network"),
                                        "batch" => array("batch"),
                                        )
                        );
@@@ -1362,7 -1371,7 +1371,7 @@@
                                        "uid_term_tid" => array("uid","term","tid"),
                                        "type_term" => array("type","term"),
                                        "uid_otype_type_term_global_created" => array("uid","otype","type","term","global","created"),
 -                                      "otype_type_term_tid" => array("otype","type","term","tid"),
 +                              //      "otype_type_term_tid" => array("otype","type","term","tid"),
                                        "uid_otype_type_url" => array("uid","otype","type","url"),
                                        "guid" => array("guid"),
                                        )
@@@ -1404,11 -1413,11 +1413,11 @@@
                                        "uid_network_created" => array("uid","network","created"),
                                        "uid_contactid_commented" => array("uid","contact-id","commented"),
                                        "uid_contactid_created" => array("uid","contact-id","created"),
 -                                      "uid_gcontactid_commented" => array("uid","gcontact-id","commented"),
 -                                      "uid_gcontactid_created" => array("uid","gcontact-id","created"),
 -                                      "wall_private_received" => array("wall","private","received"),
 +                              //      "uid_gcontactid_commented" => array("uid","gcontact-id","commented"),
 +                              //      "uid_gcontactid_created" => array("uid","gcontact-id","created"),
 +                              //      "wall_private_received" => array("wall","private","received"),
                                        "uid_created" => array("uid","created"),
 -                                      "uid_commented" => array("uid","commented"),
 +                              //      "uid_commented" => array("uid","commented"),
                                        )
                        );
        $database["tokens"] = array(