File Fix-FTBFS-caused-by-latest-mysql-library.patch of Package kde3-amarok

Overview Repositories Revisions Requests Users Attributes Meta

File Fix-FTBFS-caused-by-latest-mysql-library.patch of Package kde3-amarok

From 7f0f9e1b19e2d3a8e088653dfb6747860afa16e2 Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Sun, 10 Feb 2019 16:09:03 +0900
Subject: Fix FTBFS caused by latest mysql library.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
---
 amarok/src/collectiondb.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/amarok/src/collectiondb.cpp b/amarok/src/collectiondb.cpp
index e618ae6..e3ac93b 100644
--- a/amarok/src/collectiondb.cpp
+++ b/amarok/src/collectiondb.cpp
@@ -76,7 +76,6 @@
 
 #ifdef USE_MYSQL
     #include <mysql/mysql.h>
-    #include <mysql/mysql_version.h>
 #endif
 
 #ifdef USE_POSTGRESQL
@@ -6351,6 +6351,8 @@ MySqlConnection::MySqlConnection( const MySqlConfig* config )
 //         if ( config->username().isEmpty() )
 //             pApp->slotConfigAmarok("MySql");
 
+        int reconnect = 1;
+        mysql_options( m_db, MYSQL_OPT_RECONNECT, &reconnect );
         if ( mysql_real_connect( m_db, config->host().latin1(),
                                        config->username().latin1(),
                                        config->password().latin1(),
@@ -6370,7 +6372,6 @@ MySqlConnection::MySqlConnection( const MySqlConfig* config )
                 error() << "Failed to set database charset\n";
 #endif
 
-            m_db->reconnect = 1; //setting reconnect flag for newer mysqld
             m_connected = true;
         }
         else
-- 
cgit v1.1

Places

File Fix-FTBFS-caused-by-latest-mysql-library.patch of Package kde3-amarok

Places