From f77508b65cad5cf5814dbde6310c1dc79030ea13 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Thu, 13 Dec 2007 12:07:52 +0000 Subject: [PATCH] Compilation fix, fixed MYSQL_OPT_RECONNECT option. --- org.glite.lbjp-common.db/interface/db.h | 1 + org.glite.lbjp-common.db/src/db.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/org.glite.lbjp-common.db/interface/db.h b/org.glite.lbjp-common.db/interface/db.h index d4967a2..0351d90 100644 --- a/org.glite.lbjp-common.db/interface/db.h +++ b/org.glite.lbjp-common.db/interface/db.h @@ -5,6 +5,7 @@ #include +#include #ifdef __cplusplus diff --git a/org.glite.lbjp-common.db/src/db.c b/org.glite.lbjp-common.db/src/db.c index 214ee9d..9d9de63 100644 --- a/org.glite.lbjp-common.db/src/db.c +++ b/org.glite.lbjp-common.db/src/db.c @@ -915,7 +915,7 @@ static int db_connect(glite_lbu_DBContext ctx, const char *cs, MYSQL **mysql) { char *host,*user,*pw,*db; char *slash,*at,*colon; int ret; -#ifdef MYSQL_OPT_RECONNECT +#if MYSQL_VERSION_ID >= 50013 my_bool reconnect = 1; #endif @@ -927,7 +927,7 @@ static int db_connect(glite_lbu_DBContext ctx, const char *cs, MYSQL **mysql) { if (!(*mysql = db_handle.mysql_init(NULL))) return ERR(ctx, ENOMEM, NULL); db_handle.mysql_options(*mysql, MYSQL_READ_DEFAULT_FILE, "my"); -#ifdef MYSQL_OPT_RECONNECT +#if MYSQL_VERSION_ID >= 50013 /* XXX: may result in weird behaviour in the middle of transaction */ db_handle.mysql_options(*mysql, MYSQL_OPT_RECONNECT, &reconnect); #endif -- 1.8.2.3