Merge branch 'erp5' into erp5-generic

component/mariadb/buildout.cfg

@@ -46,6 +46,7 @@ configure-options =
   --with-plugins=max-no-ndb
   --with-aria-tmp-tables
   --without-plugin-innodb_plugin
+  --without-plugin-oqgraph
   --without-readline
   --with-ssl
   --with-libevent=${libevent:location}