diff options
| author | Michele Calgaro <[email protected]> | 2019-02-10 16:09:03 +0900 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2019-02-10 11:52:11 +0100 |
| commit | 8a4a9b5c92172333af9d334e77bfd46347ee67b1 (patch) | |
| tree | 628360254f2c54dcbb00e461927511ad86358c29 | |
| parent | d50b66ac5f1d5240ed1a550fa15cac2cb4b1cffa (diff) | |
| download | amarok-8a4a9b5c92172333af9d334e77bfd46347ee67b1.tar.gz amarok-8a4a9b5c92172333af9d334e77bfd46347ee67b1.zip | |
Fix FTBFS caused by latest mysql library.
Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 7f0f9e1b19e2d3a8e088653dfb6747860afa16e2)
| -rw-r--r-- | amarok/src/collectiondb.cpp | 3 |
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 |