Another year is about to end... So we have to update these damn copyright information :P

[NeonServV5.git] / src / mysqlConn.c

diff --git a/src/mysqlConn.c b/src/mysqlConn.c
index 12917f290b42f78625b2825cfa715f9ce09a386f..75bb4269a92528d496d7b6e8b50740ce517eb571 100644 (file)
--- a/src/mysqlConn.c
+++ b/src/mysqlConn.c
@@ -1,5 +1,5 @@
-/* mysqlConn.c - NeonServ v5.0
- * Copyright (C) 2011  Philipp Kreil (pk910)
+/* mysqlConn.c - NeonServ v5.3
+ * Copyright (C) 2011-2012  Philipp Kreil (pk910)
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
  */
 
 #include "mysqlConn.h"
-#define DATABASE_VERSION "2"
+#define DATABASE_VERSION "10"
 
 struct used_result {
     MYSQL_RES *result;
@@ -132,6 +132,10 @@ void init_mysql(char *host, int port, char *user, char *pass, char *base) {
             }
             fclose(f);
         }
+        do { 
+            MYSQL_RES *res = mysql_store_result(mysql_conn); 
+            mysql_free_result(res); 
+        } while(!mysql_next_result(mysql_conn));
         mysql_set_server_option(mysql_conn, MYSQL_OPTION_MULTI_STATEMENTS_OFF);
         mysql_query(mysql_conn, "INSERT INTO `version` (`database_version`) VALUES ('" DATABASE_VERSION "')");
     }
@@ -151,7 +155,7 @@ void init_mysql(char *host, int port, char *user, char *pass, char *base) {
                         mysql_query(mysql_conn, query_buffer);
                         query_buffer_pos = 0;
                     }
-                } else if(!stricmp(query_buffer, line)) {
+                } else if(!stricmplen(query_buffer, line, strlen(query_buffer))) {
                     use_querys = 1;
                 }
             }
@@ -162,6 +166,10 @@ void init_mysql(char *host, int port, char *user, char *pass, char *base) {
             fclose(f);
         } else
             perror("database.sql missing!");
+        do { 
+            MYSQL_RES *res = mysql_store_result(mysql_conn); 
+            mysql_free_result(res); 
+        } while(!mysql_next_result(mysql_conn));
         mysql_set_server_option(mysql_conn, MYSQL_OPTION_MULTI_STATEMENTS_OFF);
         mysql_query(mysql_conn, "UPDATE `version` SET `database_version` = '" DATABASE_VERSION "'");
     }