-/* mysqlConn.c - NeonServ v5.3
+/* mysqlConn.c - NeonServ v5.5
* Copyright (C) 2011-2012 Philipp Kreil (pk910)
*
* This program is free software: you can redistribute it and/or modify
*/
#include "mysqlConn.h"
-#define DATABASE_VERSION "15"
+#define DATABASE_VERSION "20"
+
+static void show_mysql_error();
struct mysql_conn_struct {
- unsigned long tid;
+ unsigned int tid;
MYSQL *mysql_conn;
struct used_result *used_results;
struct escaped_string *escaped_strings;
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))) {
version = atoi(row[0]);
}
}
- printf("%d \n", version);
if(!version) {
//CREATE DATABASE
FILE *f = fopen("database.sql", "r");
mysql_conns = NULL;
}
-void show_mysql_error() {
+static void show_mysql_error() {
MYSQL *mysql_conn = get_mysql_conn();
//show mysql_error()
- printf("MySQL Error: %s\n", mysql_error(mysql_conn));
+ putlog(LOGLEVEL_ERROR, "MySQL Error: %s\n", mysql_error(mysql_conn));
}
void printf_mysql_query(const char *text, ...) {
va_end(arg_list);
if (pos < 0 || pos > (MYSQLMAXLEN - 2)) pos = MYSQLMAXLEN - 2;
queryBuf[pos] = '\0';
- printf("MySQL: %s\n", queryBuf);
+ putlog(LOGLEVEL_MYSQL, "MySQL: %s\n", queryBuf);
if(mysql_query(mysql_conn, queryBuf)) {
check_mysql();
if(mysql_query(mysql_conn, queryBuf)) {
va_end(arg_list);
if (pos < 0 || pos > (len - 2)) pos = len - 2;
queryBuf[pos] = '\0';
- printf("MySQL: %s\n", queryBuf);
+ putlog(LOGLEVEL_MYSQL, "MySQL: %s\n", queryBuf);
if(mysql_query(mysql_conn, queryBuf)) {
check_mysql();
if(mysql_query(mysql_conn, queryBuf)) {
struct mysql_conn_struct *get_mysql_conn_struct() {
SYNCHRONIZE(synchronized);
struct mysql_conn_struct *mysql_conn;
- unsigned long tid;
+ unsigned int tid;
#ifdef HAVE_THREADS
- tid = syscall(SYS_gettid);
+ tid = (unsigned int) pthread_self_tid();
#else
tid = 1;
#endif