Merge pull request #15415 from ixiam/dev_issue#1297

[civicrm-core.git] / templates / CRM / common / civicrm.settings.php.template

diff --git a/templates/CRM/common/civicrm.settings.php.template b/templates/CRM/common/civicrm.settings.php.template
index c326ea4229d5e7bede1903af908e740a1487f073..4d2683f30074461794aead371da304459b02f919 100644 (file)
--- a/templates/CRM/common/civicrm.settings.php.template
+++ b/templates/CRM/common/civicrm.settings.php.template
@@ -462,20 +462,6 @@ if (!defined('CIVICRM_PSR16_STRICT')) {
  */
 define('CIVICRM_DEADLOCK_RETRIES', 3);
 
-/**
- * Enable support for multiple locks.
- *
- * This is a transitional setting. When enabled sites with mysql 5.7.5+ or equivalent
- * MariaDB can improve their DB conflict management.
- *
- * There is no known or expected downside or enabling this (and definite upside).
- * The setting only exists to allow sites to manage change in their environment
- * conservatively for the first 3 months.
- *
- * See https://github.com/civicrm/civicrm-core/pull/13854
- */
- // define('CIVICRM_SUPPORT_MULTIPLE_LOCKS', TRUE);
-
 /**
  * Configure MySQL to throw more errors when encountering unusual SQL expressions.
  *