X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2FmysqlConn.c;h=12ab76d6ff709ab7bf986e08384a62beaaef80bd;hb=c32e8254ec4ed0d77757e32f8aa5aabcdb494057;hp=ea3c2b89ab4d1042463438d4ce62d5ed97c2dd54;hpb=55831bf424312a6908ca07a904f288fba0919a9a;p=NeonServV5.git

diff --git a/src/mysqlConn.c b/src/mysqlConn.c
index ea3c2b8..12ab76d 100644
--- a/src/mysqlConn.c
+++ b/src/mysqlConn.c
@@ -16,11 +16,11 @@
  */
 
 #include "mysqlConn.h"
-#define DATABASE_VERSION "14"
+#define DATABASE_VERSION "15"
 
 struct mysql_conn_struct {
     unsigned long tid;
-    MYSQL *mysql_conn = NULL;
+    MYSQL *mysql_conn;
     struct used_result *used_results;
     struct escaped_string *escaped_strings;
     struct mysql_conn_struct *next;
@@ -264,14 +264,19 @@ char* escape_string(const char *str) {
 struct mysql_conn_struct *get_mysql_conn_struct() {
     SYNCHRONIZE(synchronized);
     struct mysql_conn_struct *mysql_conn;
-    unsigned long tid = syscall(SYS_gettid);
+    unsigned long tid;
+    #ifdef HAVE_THREADS
+    tid = syscall(SYS_gettid);
+    #else
+    tid = 1;
+    #endif
     for(mysql_conn = mysql_conns; mysql_conn; mysql_conn = mysql_conn->next) {
         if(mysql_conn->tid == tid) {
             DESYNCHRONIZE(synchronized);
             return mysql_conn;
         }
     }
-    mysql_conn = malloc(*mysql_conn);
+    mysql_conn = malloc(sizeof(*mysql_conn));
     mysql_conn->mysql_conn = mysql_init(NULL);
     mysql_conn->tid = tid;
     mysql_conn->used_results = NULL;