From cb09b59fdb2c64031d06ce489425c1a821892403 Mon Sep 17 00:00:00 2001
From: Romain Courteaud <romain@nexedi.com>
Date: Wed, 28 Dec 2011 14:18:34 +0100
Subject: [PATCH] Use MySQL instead of MariaDB

---
 component/percona-toolkit/buildout.cfg | 2 +-
 software/sanef/software.cfg            | 4 ----
 stack/erp5.cfg                         | 7 +++----
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/component/percona-toolkit/buildout.cfg b/component/percona-toolkit/buildout.cfg
index 847ec6540..5e110e8ef 100644
--- a/component/percona-toolkit/buildout.cfg
+++ b/component/percona-toolkit/buildout.cfg
@@ -2,7 +2,7 @@
 extends =
   ../perl/buildout.cfg
   ../perl-DBI/buildout.cfg
-  ../perl-DBD-mariadb/buildout.cfg
+  ../perl-DBD-MySQL/buildout.cfg
 parts =
   percona-toolkit
 
diff --git a/software/sanef/software.cfg b/software/sanef/software.cfg
index 032956585..0a52772d2 100644
--- a/software/sanef/software.cfg
+++ b/software/sanef/software.cfg
@@ -1,15 +1,11 @@
 [buildout]
 
 extends =
-  ../../component/mysql-tritonn-5.0/buildout.cfg
   ../../component/gzip/buildout.cfg
-  ../../component/maatkit/buildout.cfg
   ../erp5/software.cfg
 
 parts +=
-  mysql-tritonn-5.0
   bt5-repository
-  maatkit
 
 [eggs]
 # Just so buildout executes [bef_erp5-recipe] before [eggs], as
diff --git a/stack/erp5.cfg b/stack/erp5.cfg
index cfb362fb0..fb241149d 100644
--- a/stack/erp5.cfg
+++ b/stack/erp5.cfg
@@ -48,7 +48,7 @@ extends =
   ../component/libreoffice-bin/buildout.cfg
   ../component/lxml-python/buildout.cfg
   ../component/percona-toolkit/buildout.cfg
-  ../component/mariadb/buildout.cfg
+  ../component/mysql-tritonn-5.0/buildout.cfg
   ../component/memcached/buildout.cfg
   ../component/mysql-python/buildout.cfg
   ../component/pdftk/buildout.cfg
@@ -90,8 +90,7 @@ parts =
   poppler
   libpng
   ghostscript
-  mariadb
-  mroonga-mariadb
+  mysql-tritonn-5.0
   sphinx
   imagemagick
   kumo
@@ -101,7 +100,7 @@ parts =
   tesseract
   hookbox
   bootstrap2.6
-  perl-DBD-mariadb
+  perl-DBD-MySQL
   perl-DBI
   percona-toolkit
   zabbix-agent
-- 
2.30.9