X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2FmysqlConn.c;h=802c5918ea53b80de775b5fcccbb32c602ccb96a;hb=95b073d5242d1bf995d84e3511dbc43328ebff75;hp=02165281f6500961a2cc108ed5b1a2b602427c31;hpb=c254e7d9a1622b19aae9b4ebecb4082657288f4a;p=NeonServV5.git diff --git a/src/mysqlConn.c b/src/mysqlConn.c index 0216528..802c591 100644 --- a/src/mysqlConn.c +++ b/src/mysqlConn.c @@ -1,4 +1,4 @@ -/* mysqlConn.c - NeonServ v5.1 +/* mysqlConn.c - NeonServ v5.3 * Copyright (C) 2011 Philipp Kreil (pk910) * * This program is free software: you can redistribute it and/or modify @@ -16,7 +16,7 @@ */ #include "mysqlConn.h" -#define DATABASE_VERSION "5" +#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 "'"); }