X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2FmysqlConn.c;h=163ae12f0f04d3ff5fa6d757fe7a9bc861bce12e;hb=406c308308e4d131475a692cd425cb156e0776f1;hp=529e8a4347f6ca26a824c4a551be937c2e68ac11;hpb=d8d2d7509f04822ba3910f8f1acecdff270bfe60;p=NeonServV5.git diff --git a/src/mysqlConn.c b/src/mysqlConn.c index 529e8a4..163ae12 100644 --- a/src/mysqlConn.c +++ b/src/mysqlConn.c @@ -1,4 +1,4 @@ -/* mysqlConn.c - NeonServ v5.3 +/* mysqlConn.c - NeonServ v5.4 * Copyright (C) 2011-2012 Philipp Kreil (pk910) * * This program is free software: you can redistribute it and/or modify @@ -16,7 +16,9 @@ */ #include "mysqlConn.h" -#define DATABASE_VERSION "15" +#define DATABASE_VERSION "16" + +static void show_mysql_error(); struct mysql_conn_struct { unsigned int tid; @@ -46,7 +48,7 @@ static char *mysql_host, *mysql_user, *mysql_pass, *mysql_base; static pthread_mutex_t synchronized; #endif -void check_mysql() { +static void check_mysql() { MYSQL *mysql_conn = get_mysql_conn(); int errid; if((errid = mysql_ping(mysql_conn))) { @@ -114,7 +116,6 @@ 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"); @@ -201,7 +202,7 @@ void free_mysql() { mysql_conns = NULL; } -void show_mysql_error() { +static void show_mysql_error() { MYSQL *mysql_conn = get_mysql_conn(); //show mysql_error() putlog(LOGLEVEL_ERROR, "MySQL Error: %s\n", mysql_error(mysql_conn));