fixed modcmd privs parsing and extended merge_argv

[NeonServV5.git] / mysqlConn.c

diff --git a/mysqlConn.c b/mysqlConn.c
index fe207a797c7eccd18c116c365150fe477ca92ec2..81fa038cbbc3af2086ea15e5f11d4c121b005cc8 100644 (file)
--- a/mysqlConn.c
+++ b/mysqlConn.c
@@ -22,7 +22,7 @@ void check_mysql() {
 }
 
 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 +41,21 @@ void mysql_free() {
         mysql_free_result(result->result);
         free(result);
     }
+    used_results = NULL;
     struct escaped_string *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 +65,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,6 +78,7 @@ 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();
     }