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

diff --git a/CHANGES b/CHANGES
index e3b92fc13dbdd2c2a1274535606170571feb48b5..26cd217a8e8eb52b03df45494d1572f55a577de1 100644 (file)
--- 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 5d2739b1dddd42b927af8ce08ab08c0cb69d2235..cbf184b2c27a9829db00f2194576ca28e4b5b3d4 100644 (file)
--- 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) {