X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2FmysqlConn.c;h=75bb4269a92528d496d7b6e8b50740ce517eb571;hb=bb5692b9cbff069abbf9573c81e86c3cd2061ceb;hp=272bb21f64451f72066ef1ca9ec0c292181ca41b;hpb=441876fc5090b0327600370347b7ef923636a508;p=NeonServV5.git diff --git a/src/mysqlConn.c b/src/mysqlConn.c index 272bb21..75bb426 100644 --- a/src/mysqlConn.c +++ b/src/mysqlConn.c @@ -1,5 +1,5 @@ -/* mysqlConn.c - NeonServ v5.2 - * 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 "6" +#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 "')"); } @@ -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 "'"); }