Use compound literals in mysql_options() call

Makes use of compound literals instead of using extra my_bool
variable just to hold "true/1" value.

diff --git a/contrib/dlz/drivers/dlz_mysql_driver.c b/contrib/dlz/drivers/dlz_mysql_driver.c
index afe906a7fb1bffd596ce9e0324836caa48a3f275..86a7f59e010476c2463c57eb6a30cdebc413b410 100644 (file)
--- a/contrib/dlz/drivers/dlz_mysql_driver.c
+++ b/contrib/dlz/drivers/dlz_mysql_driver.c
@@ -763,9 +763,6 @@ mysql_create(const char *dlzname, unsigned int argc, char *argv[],
        char *endp;
        int j;
        unsigned int flags = 0;
-#if MYSQL_VERSION_ID >= 50000
-       my_bool auto_reconnect = 1;
-#endif /* if MYSQL_VERSION_ID >= 50000 */
 
        UNUSED(driverarg);
        UNUSED(dlzname);
@@ -901,21 +898,21 @@ mysql_create(const char *dlzname, unsigned int argc, char *argv[],
        pass = getParameterValue(argv[1], "pass=");
        socket = getParameterValue(argv[1], "socket=");
 
-#if MYSQL_VERSION_ID >= 50000
        /* enable automatic reconnection. */
        if (mysql_options((MYSQL *)dbi->dbconn, MYSQL_OPT_RECONNECT,
-                         &auto_reconnect) != 0)
+                         &(my_bool){ 1 }) != 0)
        {
                isc_log_write(dns_lctx, DNS_LOGCATEGORY_DATABASE,
                              DNS_LOGMODULE_DLZ, ISC_LOG_WARNING,
                              "mysql driver failed to set "
-                             "MYSQL_OPT_RECONNECT option, continuing");
+                             "MYSQL_OPT_RECONNECT option, "
+                             "continuing");
        }
-#endif /* if MYSQL_VERSION_ID >= 50000 */
 
-       for (j = 0; dbc == NULL && j < 4; j++)
+       for (j = 0; dbc == NULL && j < 4; j++) {
                dbc = mysql_real_connect((MYSQL *)dbi->dbconn, host, user, pass,
                                         dbname, port, socket, flags);
+       }
 
        /* let user know if we couldn't connect. */
        if (dbc == NULL) {

diff --git a/contrib/dlz/modules/mysql/dlz_mysql_dynamic.c b/contrib/dlz/modules/mysql/dlz_mysql_dynamic.c
index de6beac7362f07311b28b0bc60948c862ccc3789..33d307975d38d5a683b5a128f336e05bfd8519df 100644 (file)
--- a/contrib/dlz/modules/mysql/dlz_mysql_dynamic.c
+++ b/contrib/dlz/modules/mysql/dlz_mysql_dynamic.c
@@ -816,9 +816,6 @@ dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata,
        char *endp;
        int j;
        const char *helper_name;
-#if MYSQL_VERSION_ID >= 50000
-       my_bool auto_reconnect = 1;
-#endif /* if MYSQL_VERSION_ID >= 50000 */
 #if PTHREADS
        int dbcount;
        int i;
@@ -1016,17 +1013,15 @@ dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata,
 
                dbc = NULL;
 
-#if MYSQL_VERSION_ID >= 50000
                /* enable automatic reconnection. */
                if (mysql_options((MYSQL *)dbi->dbconn, MYSQL_OPT_RECONNECT,
-                                 &auto_reconnect) != 0)
+                                 &(my_bool){ 1 }) != 0)
                {
                        mysql->log(ISC_LOG_WARNING, "MySQL module failed to "
                                                    "set "
                                                    "MYSQL_OPT_RECONNECT "
                                                    "option, continuing");
                }
-#endif /* if MYSQL_VERSION_ID >= 50000 */
 
                for (j = 0; dbc == NULL && j < 4; j++) {
                        dbc = mysql_real_connect(

diff --git a/contrib/dlz/modules/mysqldyn/dlz_mysqldyn_mod.c b/contrib/dlz/modules/mysqldyn/dlz_mysqldyn_mod.c
index d6f759d4145fd3133bae6289b4f2e29804828530..cb0620fde8ef5b6bcf9778d1e9743903fc2313a9 100644 (file)
--- a/contrib/dlz/modules/mysqldyn/dlz_mysqldyn_mod.c
+++ b/contrib/dlz/modules/mysqldyn/dlz_mysqldyn_mod.c
@@ -1024,10 +1024,6 @@ dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata,
         */
        if (mysql_thread_safe()) {
                for (n = 0; n < MAX_DBI; n++) {
-#if MYSQL_VERSION_ID >= 50000
-                       my_bool opt = 1;
-#endif
-
                        dlz_mutex_init(&state->db[n].mutex, NULL);
                        dlz_mutex_lock(&state->db[n].mutex);
                        state->db[n].id = n;
@@ -1035,10 +1031,8 @@ dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata,
                        state->db[n].sock = mysql_init(NULL);
                        mysql_options(state->db[n].sock,
                                      MYSQL_READ_DEFAULT_GROUP, modname);
-#if MYSQL_VERSION_ID >= 50000
                        mysql_options(state->db[n].sock, MYSQL_OPT_RECONNECT,
-                                     &opt);
-#endif
+                                     &(my_bool){ 1 });
                        dlz_mutex_unlock(&state->db[n].mutex);
                }