Skip to content

Commit

Permalink
Fix compilation with MariaDB 10.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Paul Trunk committed Nov 14, 2017
1 parent 9e91137 commit ee2b094
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/cats/mysql.c
Expand Up @@ -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) {
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit ee2b094

Please sign in to comment.