From: Mark Andrews <marka@isc.org>
Date: Mon, 23 Nov 2009 02:40:25 +0000 (+0000)
Subject: 2777.   [contrib]       DLZ MYSQL auto reconnect support discovery was wrong.
X-Git-Tag: v9.5.2-P1~1^8~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dfc7f79a4fc94f4cecb175bd1f4c81169f15eb5a;p=thirdparty%2Fbind9.git

2777.   [contrib]       DLZ MYSQL auto reconnect support discovery was wrong.
---

diff --git a/CHANGES b/CHANGES
index e3b92fc13db..26cd217a8e8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+2777.	[contrib]	DLZ MYSQL auto reconnect support discovery was wrong.
+
 2772.	[security]	When validating, track whether pending data was from
 			the additional section or not and only return it if
 			validates as secure. [RT #20438]
diff --git a/contrib/dlz/drivers/dlz_mysql_driver.c b/contrib/dlz/drivers/dlz_mysql_driver.c
index 5d2739b1ddd..cbf184b2c27 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) {