Merge branch 'master' into DBQuery

This commit is contained in:
KimLS
2014-08-16 14:12:33 -07:00
26 changed files with 1181 additions and 506 deletions
+2 -2
View File
@@ -70,7 +70,7 @@ void ExportSpells(SharedDatabase *db) {
}
char errbuf[MYSQL_ERRMSG_SIZE];
char *query = "SELECT * FROM spells_new ORDER BY id";
const char *query = "SELECT * FROM spells_new ORDER BY id";
MYSQL_RES *result;
MYSQL_ROW row;
if(db->RunQuery(query, strlen(query), errbuf, &result)) {
@@ -176,7 +176,7 @@ void ExportBaseData(SharedDatabase *db) {
}
char errbuf[MYSQL_ERRMSG_SIZE];
char *query = "SELECT * FROM base_data ORDER BY level, class";
const char *query = "SELECT * FROM base_data ORDER BY level, class";
MYSQL_RES *result;
MYSQL_ROW row;
if(db->RunQuery(query, strlen(query), errbuf, &result)) {
+2 -2
View File
@@ -61,7 +61,7 @@ int main(int argc, char **argv) {
int GetSpellColumns(SharedDatabase *db) {
char errbuf[MYSQL_ERRMSG_SIZE];
char *query = "DESCRIBE spells_new";
const char *query = "DESCRIBE spells_new";
MYSQL_RES *result;
MYSQL_ROW row;
int res = 0;
@@ -234,4 +234,4 @@ void ImportBaseData(SharedDatabase *db) {
}
fclose(f);
}
}