--- mqtt/src/accmqtt.c	2012/04/11 15:08:27	1.2.2.1
+++ mqtt/src/accmqtt.c	2012/05/27 10:12:48	1.2.2.5
@@ -20,10 +20,24 @@ mqtt_rtlm_log(const char *fmt, ...)
 	vsyslog(LOG_ERR, fmt, lst);
 	va_end(lst);
 }
-#define MQTT_RTLM_LOG(_sql)	(assert((_sql)), mqtt_rtlm_log("Error:: SQL #%d - %s", \
+#define MQTT_RTLM_LOG(_sql)	(assert((_sql)), mqtt_rtlm_log("Error:: %s(%d) SQL #%d - %s", \
+					__func__, __LINE__, \
 					sqlite3_errcode((_sql)), sqlite3_errmsg((_sql))))
 
+/* library pre-loaded actions */
+void
+_init()
+{
+	sqlite3_initialize();
+}
 
+void
+_fini()
+{
+	sqlite3_shutdown();
+}
+
+
 /*
  * mqtt_rtlm_open() Open database connection
  *
@@ -39,9 +53,6 @@ mqtt_rtlm_open(cfg_root_t *cfg)
 	if (!cfg)
 		return NULL;
 
-	if (!sqlite3_threadsafe() || sqlite3_config(SQLITE_CONFIG_SERIALIZED))
-		return NULL;
-
 	str = (const char*) cfg_getAttribute(cfg, "mqtt_acc", "name");
 	if (!str) {
 		mqtt_rtlm_log("Error:: Unknown database name ...\n");
@@ -59,6 +70,7 @@ mqtt_rtlm_open(cfg_root_t *cfg)
 		sqlite3_close(sql);
 		return NULL;
 	}
+
 	return sql;
 }