--- mqtt/src/pubmqtt.c	2011/11/28 13:19:39	1.1.2.10
+++ mqtt/src/pubmqtt.c	2011/11/28 22:31:19	1.1.2.13
@@ -1,6 +1,9 @@
 #include "global.h"
 
 
+extern const char sql_schema[];
+
+
 /*
  * mqtt_db_log() Log database connection message
  *
@@ -36,18 +39,25 @@ mqtt_rtlm_open(sl_config *cfg)
 	if (!cfg)
 		return NULL;
 
+	sqlite3_config(SQLITE_CONFIG_SERIALIZED);
+
 	str = (const char*) cfg_GetAttribute(cfg, CFG("mqtt_pub"), CFG("name"));
 	if (!str) {
 		mqtt_rtlm_log("Error:: Unknown database name ...\n");
 		return NULL;
 	}
 
-	if (sqlite3_open_v2(str, &sql, SQLITE_OPEN_READWRITE, NULL)) {
+	if (sqlite3_open_v2(str, &sql, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, NULL)) {
 		MQTT_RTLM_LOG(sql);
 		sqlite3_close(sql);
 		return NULL;
 	}
 
+	if (sqlite3_exec(sql, sql_schema, NULL, NULL, NULL)) {
+		MQTT_RTLM_LOG(sql);
+		sqlite3_close(sql);
+		return NULL;
+	}
 	return sql;
 }
 
@@ -354,7 +364,7 @@ mqtt_rtlm_read_topic(sl_config *cfg, sqlite3 *sql, con
 
 	/* fill with data */
 	for (j = 0; j < rowz && sqlite3_step(stmt) == SQLITE_ROW; j++) {
-		s[j].sub_ret = *sqlite3_column_text(stmt, 0);
+		s[j].sub_ret = (char) sqlite3_column_int(stmt, 0);
 		s[j].sub_topic._base = strdup(sqlite3_column_text(stmt, 1));
 		s[j].sub_topic._size = strlen(s[j].sub_topic._base);
 		s[j].sub_value._base = strdup(sqlite3_column_text(stmt, 2));