In D28284#676180, @macfanplx wrote:

whats the common sense of using different names for the same product? MariaDB is the same as MySql, just different names; core and everything else stays the same.

I assume you don't have commit access and you'll need somebody to push this patch for you, right?

Yes, please go ahead if you think this has been tested well enough.

Another attempt at a simple solution that works with all versions of MariaDB and MySQL. This one comes with the added cost of including the full mysql.h because that seems to be the only consistently supplied drop-in header by MariaDB. Other solutions would involve additional CMake hackery to distinguish between MariaDB and MySQL, but for the sake of sanity, let's sacrifice compilation time for simplicity here.

indent with 4 spaces in cmake

The whole thing as one combined patch

I know, the question was whether that supersedes or amends the previous diff. But seems like it's the former. I'll update, sorry.

In D28165#633145, @wbauer wrote:

This breaks compilation here on openSUSE with MariaDB:

storage: distinguish MariaDB and MySQL for API quirks

storage: Fix for MySQL 8.0 onward