From: CiviCRM <info@civicrm.org>
Date: Tue, 3 Jun 2014 10:07:43 +0000 (+0530)
Subject: 4.5 Upgrade fix
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=92fae7a27db8ecbfbd5d6c8235f2554efc8bde34;p=civicrm-core.git

4.5 Upgrade fix
---

diff --git a/CRM/Upgrade/Incremental/php/FourFour.php b/CRM/Upgrade/Incremental/php/FourFour.php
index 876f67b428..bcad6fcf03 100644
--- a/CRM/Upgrade/Incremental/php/FourFour.php
+++ b/CRM/Upgrade/Incremental/php/FourFour.php
@@ -336,7 +336,7 @@ ALTER TABLE civicrm_dashboard
    */
   function upgrade_4_4_6($rev){
     $sql = "SELECT count(*) AS count FROM INFORMATION_SCHEMA.STATISTICS where ".
-      "INDEX_NAME = 'index_image_url' AND TABLE_NAME = 'civicrm_contact';";
+      "TABLE_SCHEMA = database() AND INDEX_NAME = 'index_image_url' AND TABLE_NAME = 'civicrm_contact';";
     $dao = CRM_Core_DAO::executeQuery($sql);
     $dao->fetch();
     if ($dao->count < 1) {
@@ -360,9 +360,6 @@ ALTER TABLE civicrm_dashboard
    * @return bool
    */
   static function upgradeImageUrls(CRM_Queue_TaskContext $ctx, $startId, $endId){
-    $sql = "CREATE INDEX index_image_url ON civicrm_contact (image_url);";
-    $dao = CRM_Core_DAO::executeQuery($sql);
-
     $sql = "
 SELECT id, image_url
 FROM civicrm_contact