summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2019-02-10 16:09:03 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2019-02-10 16:09:03 +0900
commit7f0f9e1b19e2d3a8e088653dfb6747860afa16e2 (patch)
treed383a3eb1cd788def73607d7a037e2ed03cacc80
parent15af634b9600ab7bf91f0318c9f48ed11c8e5407 (diff)
downloadamarok-7f0f9e1b.tar.gz
amarok-7f0f9e1b.zip
Fix FTBFS caused by latest mysql library.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-rw-r--r--amarok/src/collectiondb.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/amarok/src/collectiondb.cpp b/amarok/src/collectiondb.cpp
index e618ae60..e3ac93bb 100644
--- a/amarok/src/collectiondb.cpp
+++ b/amarok/src/collectiondb.cpp
@@ -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