From ee2b094bba3ec571792ef69fee2100453b13acee Mon Sep 17 00:00:00 2001 From: Paul Trunk Date: Tue, 14 Nov 2017 18:54:37 +0100 Subject: [PATCH] Fix compilation with MariaDB 10.2 --- src/cats/mysql.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/cats/mysql.c b/src/cats/mysql.c index be910fb1029..ffc2f35e8c0 100644 --- a/src/cats/mysql.c +++ b/src/cats/mysql.c @@ -156,6 +156,7 @@ bool B_DB_MYSQL::open_database(JCR *jcr) { bool retval = false; int errstat; + my_bool reconnect = 1; P(mutex); if (m_connected) { @@ -200,7 +201,7 @@ bool B_DB_MYSQL::open_database(JCR *jcr) bmicrosleep(5,0); } - m_instance.reconnect = 1; /* so connection does not timeout */ + mysql_options(&m_instance, MYSQL_OPT_RECONNECT, &reconnect); /* so connection does not timeout */ Dmsg0(50, "mysql_real_connect done\n"); Dmsg3(50, "db_user=%s db_name=%s db_password=%s\n", m_db_user, m_db_name, (m_db_password == NULL) ? "(NULL)" : m_db_password);