This is the single difference between an already present /etc/my.cnf and a file supplied by mariadb-libs:

--- /etc/my.cnf	2013-08-20 09:40:12.000000000 -0600
+++ my.cnf	2013-08-29 08:06:54.000000000 -0600
@@ -11,3 +11,3 @@
 [mysqld_safe]
-log-error=/var/log/mysqld.log
+log-error=/var/log/mariadb/mariadb.log
 pid-file=/var/run/mysqld/mysqld.pid

with this proviso that mariadb-server-5.5.32-11 actually supplies /var/log/mysqld.log -> /var/log/mariadb/mariadb.log link (before that failed update /var/log/mysqld.log is a file, owned by mariadb-server, and this looks like a possible trouble spot if mysqld.log happens to be non-emtpy).

Thanks for reporting, guys.

This is quite complicated issue, because both packages by default read only /etc/my.cnf and other files under /etc/my.cnf.d/ are read only after !includedir statement is used in /etc/my.cnf explicitly. So generally, having two non-conflicting /etc/my.cnf config files in two separate packages seems to be a need. So this file actually needs to be the same in both packages (or moved to the separate package, while using proper requirements, but the result would be the same).

So the fix I'm going to apply will be to keep only general settings for all MySQL implementations in /etc/my.cnf, while moving MariaDB-specific settings into specific sections like [mariadb] or [mariadb-5.5], which were introduced especially for such purposes.

(In reply to Michal Jaegermann from comment #1)
> with this proviso that mariadb-server-5.5.32-11 actually supplies
> /var/log/mysqld.log -> /var/log/mariadb/mariadb.log link (before that failed
> update /var/log/mysqld.log is a file, owned by mariadb-server, and this
> looks like a possible trouble spot if mysqld.log happens to be non-emtpy).

We're aware of possible issues (tracked down in bug #999589) but we believe all common cases should work fine and advantages will surpass issues. Of course, this will need to be mentioned in release notes. For more info see https://bugzilla.redhat.com/show_bug.cgi?id=999589#c1

New builds community-mysql-libs-5.5.33-2.fc20 and mariadb-libs-5.5.32-12.fc20 are not in conflict any more:

# rpm -q mariadb-libs community-mysql-libs
mariadb-libs-5.5.32-12.fc20.x86_64
community-mysql-libs-5.5.33-2.fc20.x86_64

On rawhide there is still:

Transaction check error:
  file /etc/my.cnf from install of community-mysql-libs-5.6.14-1.fc21.x86_64 conflicts with file from package mariadb-libs-1:5.5.32-12.fc21.x86_64
This is a build from "Thu 10 Oct 2013" for community-mysql-libs.

Thanks for pointing to that. It's fixed again with community-mysql-5.6.14-2.fc21.

Seems to be a problem again in F20:

Error: community-mysql conflicts with 1:mariadb-5.5.33a-2.fc20.x86_64
Error: mariadb conflicts with community-mysql-5.5.34-1.fc20.x86_64

(In reply to Mattia Verga from comment #6)
> Seems to be a problem again in F20:
> 
> Error: community-mysql conflicts with 1:mariadb-5.5.33a-2.fc20.x86_64
> Error: mariadb conflicts with community-mysql-5.5.34-1.fc20.x86_64

Actually, this conflict is expected and defined explicitly. The only packages that are expected to be installed in parallel are mariadb-libs and community-mysql-libs packages, which seems to work fine:

$ rpm -q community-mysql-libs mariadb-libs
community-mysql-libs-5.5.34-1.fc20.x86_64
mariadb-libs-5.5.33a-2.fc20.x86_64