Date: Thursday, May 10, 2007 @ 16:00:02
Author: marc
Path: /cvsroot/carob/libmysequoia/src
Modified: CarobMySQL.cpp (1.109 -> 1.110)
Allow negative controller_timeout and ping_delay hacks
----------------+
CarobMySQL.cpp | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
Index: libmysequoia/src/CarobMySQL.cpp
diff -u libmysequoia/src/CarobMySQL.cpp:1.109
libmysequoia/src/CarobMySQL.cpp:1.110
--- libmysequoia/src/CarobMySQL.cpp:1.109 Mon May 7 14:59:12 2007
+++ libmysequoia/src/CarobMySQL.cpp Thu May 10 16:00:02 2007
@@ -1172,7 +1172,6 @@
char *home_dir = getenv("HOME");
char *conf_dir = getenv("LIBMYSEQUOIA_CONF_DIR");
IniParser ini;
- int val = 0;
/*
* The order of reading the config files:
@@ -1221,10 +1220,15 @@
cstrdupcond(mysqlPtr->options.password, ini.get(group, "password").c_str());
cstrdupcond(mysqlPtr->options.db, ini.get(group, "database").c_str());
mysqlPtr->options.port = atoi(ini.get(group, "port").c_str());
- if ((val = atoi(ini.get(group, "ping_delay").c_str())) > 0)
- ping_delay = val;
- if ((val = atoi(ini.get(group, "controller_timeout").c_str())) > 0)
- controller_timeout = val;
+
+ string val = ini.get(group, "ping_delay");
+ if (!val.empty())
+ ping_delay = atoi(val.c_str());
+
+ val = ini.get(group, "controller_timeout");
+ if (!val.empty())
+ controller_timeout = atoi(val.c_str());
+
if (!mysqlPtr->options.charset_name || !*mysqlPtr->options.charset_name)
cstrdupcond(mysqlPtr->options.charset_name, ini.get(group,
"default-character-set").c_str());
if (!mysqlPtr->options.charset_dir || !*mysqlPtr->options.charset_dir)
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
