fixed "may be uninitialized" on linux systems

[NeonServV5.git] / src / mysqlConn.c

diff --git a/src/mysqlConn.c b/src/mysqlConn.c
index 5965e6aafa6d171434bbc11bb3262279f7340a5c..7484059af85131488672869a05a6f1c057de967e 100644 (file)
--- a/src/mysqlConn.c
+++ b/src/mysqlConn.c
@@ -82,6 +82,7 @@ void init_mysql(char *host, int port, char *user, char *pass, char *base) {
             version = atoi(row[0]);
         }
     }
+    printf("%d \n", version);
     if(!version) {
         //CREATE DATABASE
         FILE *f = fopen("database.sql", "r");
@@ -92,30 +93,31 @@ void init_mysql(char *host, int port, char *user, char *pass, char *base) {
             int query_buffer_pos = 0;
             while (fgets(line, sizeof(line), f)) {
                 query_buffer_pos += sprintf(query_buffer + query_buffer_pos, " %s", line);
-                if(line[(strlen(line) - 1)] == ';') {
-                    mysql_query(mysql_conn, query_buffer);
+                if(line[(strlen(line) - 2)] == ';') {
+                    if(mysql_query(mysql_conn, query_buffer))
+                        show_mysql_error();
                     query_buffer_pos = 0;
                 }
             }
             fclose(f);
         }
         f = fopen("database.defaults.sql", "r");
-        mysql_set_server_option(mysql_conn, MYSQL_OPTION_MULTI_STATEMENTS_ON);
         if (f) {
-            char line[2048];
-            char query_buffer[65536];
+            char line[4096];
+            char query_buffer[131072];
             int query_buffer_pos = 0;
             while (fgets(line, sizeof(line), f)) {
                 query_buffer_pos += sprintf(query_buffer + query_buffer_pos, " %s", line);
-                if(line[(strlen(line) - 1)] == ';') {
-                    mysql_query(mysql_conn, query_buffer);
+                if(line[(strlen(line) - 2)] == ';') {
+                    if(mysql_query(mysql_conn, query_buffer))
+                        show_mysql_error();
                     query_buffer_pos = 0;
                 }
             }
             fclose(f);
         }
         mysql_set_server_option(mysql_conn, MYSQL_OPTION_MULTI_STATEMENTS_OFF);
-        mysql_query(mysql_conn, "UPDATE `version` SET `database_version` = '" DATABASE_VERSION "'");
+        mysql_query(mysql_conn, "INSERT INTO `version` (`database_version`) VALUES ('" DATABASE_VERSION "')");
     }
     else if(version < atoi(DATABASE_VERSION)) {
         //UPDATE DATABASE
@@ -137,8 +139,13 @@ void init_mysql(char *host, int port, char *user, char *pass, char *base) {
                     use_querys = 1;
                 }
             }
+            if(query_buffer_pos) {
+                if(mysql_query(mysql_conn, query_buffer))
+                    show_mysql_error();
+            }
             fclose(f);
-        }
+        } else
+            perror("database.sql missing!");
         mysql_set_server_option(mysql_conn, MYSQL_OPTION_MULTI_STATEMENTS_OFF);
         mysql_query(mysql_conn, "UPDATE `version` SET `database_version` = '" DATABASE_VERSION "'");
     }