Merge pull request #13258 from eileenmcnaughton/isam

[civicrm-core.git] / CRM / Utils / SQL.php

diff --git a/CRM/Utils/SQL.php b/CRM/Utils/SQL.php
index 3a90ee05d191527fb05111698625b752fb976dd9..0104fd50c75e23ef461c99c758b86691d0c2ac99 100644 (file)
--- a/CRM/Utils/SQL.php
+++ b/CRM/Utils/SQL.php
@@ -112,9 +112,6 @@ class CRM_Utils_SQL {
    * @return bool
    */
   public static function isGroupByModeInDefault() {
-    if (!self::supportsFullGroupBy()) {
-      return FALSE;
-    }
     $sqlModes = explode(',', CRM_Core_DAO::singleValueQuery('SELECT @@global.sql_mode'));
     if (!in_array('ONLY_FULL_GROUP_BY', $sqlModes)) {
       return FALSE;
@@ -124,6 +121,8 @@ class CRM_Utils_SQL {
 
   /**
    * Is the Database set up to handle acceents.
+   * @warning This function was introduced in attempt to determine the reason why the test getInternationalStrings was failing on ubu1604 but passing on ubu1204-5
+   * This function should not be used as the basis of further work as the reasoning is not perfact and is giving false failures.
    * @return bool
    */
   public static function supportStorageOfAccents() {