changed Makefile; build all commands as an own file

[NeonServV5.git] / mysqlConn.c

diff --git a/mysqlConn.c b/mysqlConn.c
index 84933b0bd65a271e066738c4e3a2e7d62e6f6a8c..66494e7f5055cf333db9d500c9bde2a605c7f2cd 100644 (file)
--- a/mysqlConn.c
+++ b/mysqlConn.c
@@ -16,13 +16,21 @@ static struct used_result *used_results;
 static struct escaped_string *escaped_strings;
 
 void check_mysql() {
-    if(mysql_ping(mysql_conn)) {
-        //mysql error
+    int errid;
+    if((errid = mysql_ping(mysql_conn))) {
+        if(mysql_errno(mysql_conn) == CR_SERVER_GONE_ERROR) {
+            if(!mysql_real_connect(mysql_conn, MYSQL_HOST, MYSQL_USER, MYSQL_PASS, MYSQL_BASE, MYSQL_PORT, NULL, 0)) {
+                show_mysql_error();
+            }
+        } else {
+            //mysql error
+            show_mysql_error();
+        }
     }
 }
 
 MYSQL_RES *mysql_use() {
-    MYSQL_RES *res = mysql_use_result(mysql_conn);
+    MYSQL_RES *res = mysql_store_result(mysql_conn);
     struct used_result *result = malloc(sizeof(*result));
     if (!result) {
         mysql_free_result(res);
@@ -41,18 +49,21 @@ void mysql_free() {
         mysql_free_result(result->result);
         free(result);
     }
+    used_results = NULL;
     struct escaped_string *escaped, *next_escaped;
-    for(escaped = escaped_string; escaped; escaped = next_escaped) {
+    for(escaped = escaped_strings; escaped; escaped = next_escaped) {
         next_escaped = escaped->next;
         free(escaped->string);
         free(escaped);
     }
+    escaped_strings = NULL;
 }
 
 void init_mysql() {
     mysql_conn = mysql_init(NULL);
     if (!mysql_real_connect(mysql_conn, MYSQL_HOST, MYSQL_USER, MYSQL_PASS, MYSQL_BASE, MYSQL_PORT, NULL, 0)) {
         //error
+        show_mysql_error();
     }
 }
 
@@ -62,7 +73,7 @@ void free_mysql() {
 
 void show_mysql_error() {
     //show mysql_error()
-    
+    printf("MySQL Error: %s\n", mysql_error(mysql_conn));
 }
 
 void printf_mysql_query(const char *text, ...) {
@@ -75,8 +86,12 @@ void printf_mysql_query(const char *text, ...) {
     va_end(arg_list);
     if (pos < 0 || pos > (MYSQLMAXLEN - 2)) pos = MYSQLMAXLEN - 2;
     queryBuf[pos] = '\0';
+    printf("MySQL: %s\n", queryBuf);
     if(mysql_query(mysql_conn, queryBuf)) {
-        show_mysql_error();
+        check_mysql();
+        if(mysql_query(mysql_conn, queryBuf)) {
+            show_mysql_error();
+        }
     }
 }