473e3e8 Conflict only with real-mysql, otherwise mariadb conflicts with ourself

Authored and Committed by hhorak 11 years ago
1 file changed. 9 lines added. 8 lines removed.
    Conflict only with real-mysql, otherwise mariadb conflicts with ourself
    
        
file modified
+9 -8