From 5163a8fcb9cfd63435560fda00173b76df2ccc93 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Mon, 7 Apr 2014 10:22:18 +0200
Subject: [PATCH] Disable connection reaping for MySQL

On GitLab Cloud, MySQL connection reaping seemed to cause more problems
(exceptions and segfaults in the native MySQL client) than it solved.
---
 CHANGELOG                 | 1 +
 config/database.yml.mysql | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index d0613c301e..a6f2b36d31 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,6 +9,7 @@ v 6.8.0
   - Changed permission of gitlab-satellites directory not to be world accessible
   - Protected branch does not allow force push
   - Fix popen bug in `rake gitlab:satellites:create`
+  - Disable connection reaping for MySQL
 
 v 6.7.3
   - Fix the merge notification email not being sent (Pierre de La Morinerie)
diff --git a/config/database.yml.mysql b/config/database.yml.mysql
index 6943aaca45..55ac088bc1 100644
--- a/config/database.yml.mysql
+++ b/config/database.yml.mysql
@@ -7,7 +7,6 @@ production:
   reconnect: false
   database: gitlabhq_production
   pool: 10
-  reaping_frequency: 10
   username: git
   password: "secure password"
   # host: localhost