[patch] patch to solve compilation errors with mysq-connector-c- 8

0001-Amarok-fix-build-with-mysql-connector-c-8-and-above.patch (text/plain), 1.74 KB, created by François Valenduc on 2020-02-21 19:07:50 UTC

From 19ca3288737253391f4780f38b4703a3964cbd73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Valenduc?= <[e-mail]>
Date: Fri, 21 Feb 2020 08:35:40 +0100
Subject: [PATCH] Amarok: fix build with mysql-connector-c-8 and above

Fix build with musql-connector-c-8 and above which removed support for
mysql embedded (from
https://forum.kde.org/viewtopic.php?f=117&t=162903&p=428560)
---
 src/core-impl/storage/sql/mysql-shared/MySqlStorage.h          | 3 +--
 .../storage/sql/mysqlserverstorage/MySqlServerStorage.cpp      | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/core-impl/storage/sql/mysql-shared/MySqlStorage.h b/src/core-impl/storage/sql/mysql-shared/MySqlStorage.h
index eb88e7582c..f51399a36a 100644
--- a/src/core-impl/storage/sql/mysql-shared/MySqlStorage.h
+++ b/src/core-impl/storage/sql/mysql-shared/MySqlStorage.h
@@ -28,8 +28,7 @@
   #include <winsock2.h>
 #endif
 
-struct st_mysql;
-typedef struct st_mysql MYSQL;
+typedef struct MYSQL MYSQL;
 
 /**
  * Implements a SqlStorage using a MySQL backend
diff --git a/src/core-impl/storage/sql/mysqlserverstorage/MySqlServerStorage.cpp b/src/core-impl/storage/sql/mysqlserverstorage/MySqlServerStorage.cpp
index 7caa6838b8..1edca71df3 100644
--- a/src/core-impl/storage/sql/mysqlserverstorage/MySqlServerStorage.cpp
+++ b/src/core-impl/storage/sql/mysqlserverstorage/MySqlServerStorage.cpp
@@ -66,7 +66,7 @@ MySqlServerStorage::init( const QString &host, const QString &user, const QStrin
     }
 
     //first here, the right way for >= 5.1.6
-    my_bool reconnect = true;
+    bool reconnect = true;
     if( mysql_options( m_db, MYSQL_OPT_RECONNECT, &reconnect ) )
         reportError( "Asking for automatic reconnect did not succeed!" );
     else
-- 
2.24.1