Far worse really. If you want an all in one solution, there's already VLC.

That's a bit like saying, "Make France, Germany, the UK, Spain, Italy, and Switzerland into a single country." :)

Thanks for testing! This was pushed with final changes addressing @wbauer's comments in commits 4337b3ef, 03ef605c and 822eddec.

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.

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.

Commited with https://invent.kde.org/multimedia/amarok/commit/87c56f8a130b2ddf183922015ce5bb31173bd912

Ok, as it was accepted, and there were no further comments since my last question whether I should change it, I'm just going to commit it now.

One thing I should note though: we do use a patch to fix things on openSUSE currently, but that's not a problem of this change.

Sorry if you were waiting for me.
It's good to go in from my side. I actually built mariadb-connector-c without mysql support here as a test, and it still worked fine.

e17a38b179197d9afa303de6e254fbc284c5fa9e did something similar, I suppose this can be closed?

In D28593#645766, @heikobecker wrote:

Oh, and although it was closed because of a missing backtrace it looks like this would fix: https://bugs.kde.org/show_bug.cgi?id=411716

Oh, and although it was closed because of a missing backtrace it looks like this would fix: https://bugs.kde.org/show_bug.cgi?id=411716

Fixed generation of export header

• Fix generation and usage of export headers

re-add accidentally removed required includes to FindMySQLe.cmake

On openSUSE, it doesn't enable MySQLe anymore:

updated for the case when mysqle is shipped with mariadb

In D28165#634060, @asturmlechner wrote:

In D28165#633145, @wbauer wrote:

The content of my /usr/include/mysql/mysql_version.h (which is just a symlink to mariadb_version.h):

I just went back and installed mariadb-connector-c in Gentoo in mysqlcompat-mode (a soon to be removed option) and interestingly, it does not provide that symlink.

Indeed, the symlink is added in openSUSE's packaging. From mariadb-connector-c.spec:

# add a compatibility symlink
ln -s mariadb_config %{buildroot}%{_bindir}/mysql_config
ln -s mariadb_version.h %{buildroot}%{_includedir}/mysql/mysql_version.h

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.

In D28165#634404, @asturmlechner wrote:

Waiting for @wbauer to confirm it works as well

Yes, the latest version builds fine here (the previous did as well), and the embedded collection still works as well.

scrobble it does 👍

Builds fine here with mariadb and WITH_MYSQL_EMBEDDED=TRUE.

Waiting for @wbauer to confirm it works as well - btw, does openSUSE still provide mysqle to test -DWITH_MYSQL_EMBEDDED=on?

In D28165#634067, @vmatare wrote:

Please test again, and thanks a lot for the review so far.

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

In D28165#633145, @wbauer wrote:

The content of my /usr/include/mysql/mysql_version.h (which is just a symlink to mariadb_version.h):

Confirming successful build here as well.

Thanks for the very nice patch! Compiles and works for me on Gentoo (MySQL Connector/C 8.0.19).

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.

That diff now looks like a diff in top of your previous diff.

In D28165#633145, @wbauer wrote:

This breaks compilation here on openSUSE with MariaDB:

storage: distinguish MariaDB and MySQL for API quirks

This breaks compilation here on openSUSE with MariaDB:

storage: Fix for MySQL 8.0 onward

fix segfault when destroying LastfmService due to bad QSharedPointer usage

Cleaned up some includes.

Added some performance optimizations to the analyzer applet.