-/* 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
*/
#include "mysqlConn.h"
-#define DATABASE_VERSION "2"
+#define DATABASE_VERSION "14"
struct used_result {
MYSQL_RES *result;
}
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 "')");
}
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;
}
}
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 "'");
}
}
}
+void printf_long_mysql_query(int len, const char *text, ...) {
+ va_list arg_list;
+ char queryBuf[len];
+ int pos;
+ queryBuf[0] = '\0';
+ va_start(arg_list, text);
+ pos = vsnprintf(queryBuf, len - 2, text, arg_list);
+ va_end(arg_list);
+ if (pos < 0 || pos > (len - 2)) pos = len - 2;
+ queryBuf[pos] = '\0';
+ printf("MySQL: %s\n", queryBuf);
+ if(mysql_query(mysql_conn, queryBuf)) {
+ check_mysql();
+ if(mysql_query(mysql_conn, queryBuf)) {
+ show_mysql_error();
+ }
+ }
+}
+
char* escape_string(const char *str) {
struct escaped_string *escapedstr = malloc(sizeof(*escapedstr));
if (!escapedstr) {