From 289dbe005c271d344296cad043157fee6604bdb0 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Mon, 23 Nov 2009 02:37:14 +0000 Subject: [PATCH] 2777. [contrib] DLZ MYSQL auto reconnect support discovery was wrong. --- CHANGES | 2 ++ contrib/dlz/drivers/dlz_mysql_driver.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 34a8f6e098..9be2e9470c 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,5 @@ +2777. [contrib] DLZ MYSQL auto reconnect support discovery was wrong. + 2776. [bug] Change #2762 was not correct. [RT #20647] 2775. [bug] Accept RSASHA256 and RSASHA512 as NSEC3 compatible diff --git a/contrib/dlz/drivers/dlz_mysql_driver.c b/contrib/dlz/drivers/dlz_mysql_driver.c index 5d2739b1dd..cbf184b2c2 100644 --- a/contrib/dlz/drivers/dlz_mysql_driver.c +++ b/contrib/dlz/drivers/dlz_mysql_driver.c @@ -792,7 +792,7 @@ mysql_create(const char *dlzname, unsigned int argc, char *argv[], char *endp; int j; unsigned int flags = 0; -#ifdef MYSQL_OPT_RECONNECT +#if MYSQL_VERSION_ID >= 50000 my_bool auto_reconnect = 1; #endif @@ -926,7 +926,7 @@ mysql_create(const char *dlzname, unsigned int argc, char *argv[], pass = getParameterValue(argv[1], "pass="); socket = getParameterValue(argv[1], "socket="); -#ifdef MYSQL_OPT_RECONNECT +#if MYSQL_VERSION_ID >= 50000 /* enable automatic reconnection. */ if (mysql_options((MYSQL *) dbi->dbconn, MYSQL_OPT_RECONNECT, &auto_reconnect) != 0) {