From 7820c5340f079dc9621a36dbed103a3bbc29ae8a Mon Sep 17 00:00:00 2001
From: monishdeb <monish.deb@webaccessglobal.com>
Date: Fri, 15 Jan 2016 19:42:01 +0530
Subject: [PATCH] CRM-17854 && CRM-17685 fix - CiviCRM DB Syntax Error when
 enabling logging

https://issues.civicrm.org/jira/browse/CRM-17685
https://issues.civicrm.org/jira/browse/CRM-17854
---
 CRM/Logging/Schema.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CRM/Logging/Schema.php b/CRM/Logging/Schema.php
index 9bc1483514..ba0c03805e 100644
--- a/CRM/Logging/Schema.php
+++ b/CRM/Logging/Schema.php
@@ -497,6 +497,7 @@ WHERE  table_schema IN ('{$this->db}', '{$civiDB}')";
 
     // rewrite the queries into CREATE TABLE queries for log tables:
     $cols = <<<COLS
+            ,
             log_date    TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
             log_conn_id INTEGER,
             log_user_id INTEGER,
@@ -517,7 +518,7 @@ COLS;
     // so there's no need for a default timestamp and therefore we remove such default timestamps
     // also eliminate the NOT NULL constraint, since we always copy and schema can change down the road)
     $query = self::fixTimeStampAndNotNullSQL($query);
-    $query = preg_replace("/^\) /m", "$cols\n) ", $query);
+    $query = preg_replace("/(,*\n*\) )ENGINE/m", "$cols\n) ENGINE", $query);
 
     CRM_Core_DAO::executeQuery($query);
 
-- 
2.25.1