From c17582c0c99cb2a3d390268bef859c469ec58bea Mon Sep 17 00:00:00 2001 From: =?utf8?q?William=20Tis=C3=A4ter?= Date: Mon, 29 Apr 2013 00:01:24 +0200 Subject: [PATCH] Drop st_mysql_options and use db->con->options instead --- src/mysql.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/mysql.c b/src/mysql.c index 670179bf..8b660a3c 100644 --- a/src/mysql.c +++ b/src/mysql.c @@ -64,7 +64,6 @@ struct mysql_database_s /* {{{ */ }; typedef struct mysql_database_s mysql_database_t; /* }}} */ -struct st_mysql_options *options; static int mysql_read (user_data_t *ud); void mysql_read_default_options(struct st_mysql_options *options, @@ -274,8 +273,8 @@ static MYSQL *getconnection (mysql_database_t *db) } } - options->connect_timeout = db->timeout; - mysql_read_default_options(options, NULL, NULL); + /* Configure TCP connect timeout (default: 0) */ + db->con->options.connect_timeout = db->timeout; if (mysql_real_connect (db->con, db->host, db->user, db->pass, db->database, db->port, db->socket, 0) == NULL) -- 2.11.0