diff --git a/common/shareddb.cpp b/common/shareddb.cpp
index 6b4a43a13..b90097a1e 100644
--- a/common/shareddb.cpp
+++ b/common/shareddb.cpp
@@ -1423,164 +1423,161 @@ int SharedDatabase::GetMaxSpellID() {
 
 void SharedDatabase::LoadSpells(void *data, int max_spells) {
 	SPDat_Spell_Struct *sp = reinterpret_cast<SPDat_Spell_Struct*>(data);
-	char errbuf[MYSQL_ERRMSG_SIZE];
-	char *query = 0;
-	MYSQL_RES *result;
-	MYSQL_ROW row;
 
-	if(RunQuery(query, MakeAnyLenString(&query,
-		"SELECT * FROM spells_new ORDER BY id ASC"),
-		errbuf, &result)) {
-		safe_delete_array(query);
+	const std::string query = "SELECT * FROM spells_new ORDER BY id ASC";
+    auto results = QueryDatabase(query);
+    if (!results.Success()) {
+        _log(SPELLS__LOAD_ERR, "Error in LoadSpells query '%s' %s", query.c_str(), results.ErrorMessage().c_str());
+        return;
+    }
 
-		int tempid = 0;
-		int counter = 0;
+    if(results.ColumnCount() <= SPELL_LOAD_FIELD_COUNT) {
+		_log(SPELLS__LOAD_ERR, "Fatal error loading spells: Spell field count < SPELL_LOAD_FIELD_COUNT(%u)", SPELL_LOAD_FIELD_COUNT);
+		return;
+    }
 
-		if(result && mysql_field_count(getMySQL()) <= SPELL_LOAD_FIELD_COUNT) {
-			_log(SPELLS__LOAD_ERR, "Fatal error loading spells: Spell field count < SPELL_LOAD_FIELD_COUNT(%u)", SPELL_LOAD_FIELD_COUNT);
-			mysql_free_result(result);
-			return;
-		}
+    int tempid = 0;
+    int counter = 0;
 
-		while (row = mysql_fetch_row(result)) {
-			tempid = atoi(row[0]);
-			if(tempid >= max_spells) {
-				_log(SPELLS__LOAD_ERR, "Non fatal error: spell.id >= max_spells, ignoring.");
-				continue;
-			}
+    for (auto row = results.begin(); row != results.end(); ++row) {
+        tempid = atoi(row[0]);
+        if(tempid >= max_spells) {
+            _log(SPELLS__LOAD_ERR, "Non fatal error: spell.id >= max_spells, ignoring.");
+            continue;
+        }
 
-			++counter;
-			sp[tempid].id = tempid;
-			strn0cpy(sp[tempid].name, row[1], sizeof(sp[tempid].name));
-			strn0cpy(sp[tempid].player_1, row[2], sizeof(sp[tempid].player_1));
-			strn0cpy(sp[tempid].teleport_zone, row[3], sizeof(sp[tempid].teleport_zone));
-			strn0cpy(sp[tempid].you_cast, row[4], sizeof(sp[tempid].you_cast));
-			strn0cpy(sp[tempid].other_casts, row[5], sizeof(sp[tempid].other_casts));
-			strn0cpy(sp[tempid].cast_on_you, row[6], sizeof(sp[tempid].cast_on_you));
-			strn0cpy(sp[tempid].cast_on_other, row[7], sizeof(sp[tempid].cast_on_other));
-			strn0cpy(sp[tempid].spell_fades, row[8], sizeof(sp[tempid].spell_fades));
+        ++counter;
+        sp[tempid].id = tempid;
+        strn0cpy(sp[tempid].name, row[1], sizeof(sp[tempid].name));
+        strn0cpy(sp[tempid].player_1, row[2], sizeof(sp[tempid].player_1));
+		strn0cpy(sp[tempid].teleport_zone, row[3], sizeof(sp[tempid].teleport_zone));
+		strn0cpy(sp[tempid].you_cast, row[4], sizeof(sp[tempid].you_cast));
+		strn0cpy(sp[tempid].other_casts, row[5], sizeof(sp[tempid].other_casts));
+		strn0cpy(sp[tempid].cast_on_you, row[6], sizeof(sp[tempid].cast_on_you));
+		strn0cpy(sp[tempid].cast_on_other, row[7], sizeof(sp[tempid].cast_on_other));
+		strn0cpy(sp[tempid].spell_fades, row[8], sizeof(sp[tempid].spell_fades));
 
-			sp[tempid].range=static_cast<float>(atof(row[9]));
-			sp[tempid].aoerange=static_cast<float>(atof(row[10]));
-			sp[tempid].pushback=static_cast<float>(atof(row[11]));
-			sp[tempid].pushup=static_cast<float>(atof(row[12]));
-			sp[tempid].cast_time=atoi(row[13]);
-			sp[tempid].recovery_time=atoi(row[14]);
-			sp[tempid].recast_time=atoi(row[15]);
-			sp[tempid].buffdurationformula=atoi(row[16]);
-			sp[tempid].buffduration=atoi(row[17]);
-			sp[tempid].AEDuration=atoi(row[18]);
-			sp[tempid].mana=atoi(row[19]);
+		sp[tempid].range=static_cast<float>(atof(row[9]));
+		sp[tempid].aoerange=static_cast<float>(atof(row[10]));
+		sp[tempid].pushback=static_cast<float>(atof(row[11]));
+		sp[tempid].pushup=static_cast<float>(atof(row[12]));
+		sp[tempid].cast_time=atoi(row[13]);
+		sp[tempid].recovery_time=atoi(row[14]);
+		sp[tempid].recast_time=atoi(row[15]);
+		sp[tempid].buffdurationformula=atoi(row[16]);
+		sp[tempid].buffduration=atoi(row[17]);
+		sp[tempid].AEDuration=atoi(row[18]);
+		sp[tempid].mana=atoi(row[19]);
 
-			int y=0;
-			for(y=0; y< EFFECT_COUNT;y++)
-				sp[tempid].base[y]=atoi(row[20+y]); // effect_base_value
-			for(y=0; y < EFFECT_COUNT; y++)
-				sp[tempid].base2[y]=atoi(row[32+y]); // effect_limit_value
-			for(y=0; y< EFFECT_COUNT;y++)
-				sp[tempid].max[y]=atoi(row[44+y]);
+		int y=0;
+		for(y=0; y< EFFECT_COUNT;y++)
+			sp[tempid].base[y]=atoi(row[20+y]); // effect_base_value
 
-			for(y=0; y< 4;y++)
-				sp[tempid].components[y]=atoi(row[58+y]);
+		for(y=0; y < EFFECT_COUNT; y++)
+			sp[tempid].base2[y]=atoi(row[32+y]); // effect_limit_value
 
-			for(y=0; y< 4;y++)
-				sp[tempid].component_counts[y]=atoi(row[62+y]);
+		for(y=0; y< EFFECT_COUNT;y++)
+			sp[tempid].max[y]=atoi(row[44+y]);
 
-			for(y=0; y< 4;y++)
-				sp[tempid].NoexpendReagent[y]=atoi(row[66+y]);
+		for(y=0; y< 4;y++)
+			sp[tempid].components[y]=atoi(row[58+y]);
 
-			for(y=0; y< EFFECT_COUNT;y++)
-				sp[tempid].formula[y]=atoi(row[70+y]);
+		for(y=0; y< 4;y++)
+			sp[tempid].component_counts[y]=atoi(row[62+y]);
 
-			sp[tempid].goodEffect=atoi(row[83]);
-			sp[tempid].Activated=atoi(row[84]);
-			sp[tempid].resisttype=atoi(row[85]);
+		for(y=0; y< 4;y++)
+			sp[tempid].NoexpendReagent[y]=atoi(row[66+y]);
 
-			for(y=0; y< EFFECT_COUNT;y++)
-				sp[tempid].effectid[y]=atoi(row[86+y]);
+		for(y=0; y< EFFECT_COUNT;y++)
+			sp[tempid].formula[y]=atoi(row[70+y]);
 
-			sp[tempid].targettype = (SpellTargetType) atoi(row[98]);
-			sp[tempid].basediff=atoi(row[99]);
-			int tmp_skill = atoi(row[100]);;
-			if(tmp_skill < 0 || tmp_skill > HIGHEST_SKILL)
-				sp[tempid].skill = SkillBegging; /* not much better we can do. */ // can probably be changed to client-based 'SkillNone' once activated
-			else
-				sp[tempid].skill = (SkillUseTypes) tmp_skill;
-			sp[tempid].zonetype=atoi(row[101]);
-			sp[tempid].EnvironmentType=atoi(row[102]);
-			sp[tempid].TimeOfDay=atoi(row[103]);
+		sp[tempid].goodEffect=atoi(row[83]);
+		sp[tempid].Activated=atoi(row[84]);
+		sp[tempid].resisttype=atoi(row[85]);
 
-			for(y=0; y < PLAYER_CLASS_COUNT;y++)
-				sp[tempid].classes[y]=atoi(row[104+y]);
+		for(y=0; y< EFFECT_COUNT;y++)
+			sp[tempid].effectid[y]=atoi(row[86+y]);
 
-			sp[tempid].CastingAnim=atoi(row[120]);
-			sp[tempid].SpellAffectIndex=atoi(row[123]);
-			sp[tempid].disallow_sit=atoi(row[124]);
+		sp[tempid].targettype = (SpellTargetType) atoi(row[98]);
+		sp[tempid].basediff=atoi(row[99]);
 
-			for (y = 0; y < 16; y++)
-				sp[tempid].deities[y]=atoi(row[126+y]);
+		int tmp_skill = atoi(row[100]);;
 
-			sp[tempid].uninterruptable=atoi(row[146]) != 0;
-			sp[tempid].ResistDiff=atoi(row[147]);
-			sp[tempid].dot_stacking_exempt=atoi(row[148]);
-			sp[tempid].RecourseLink = atoi(row[150]);
-			sp[tempid].no_partial_resist = atoi(row[151]) != 0;
+		if(tmp_skill < 0 || tmp_skill > HIGHEST_SKILL)
+            sp[tempid].skill = SkillBegging; /* not much better we can do. */ // can probably be changed to client-based 'SkillNone' once activated
+        else
+			sp[tempid].skill = (SkillUseTypes) tmp_skill;
 
-			sp[tempid].short_buff_box = atoi(row[154]);
-			sp[tempid].descnum = atoi(row[155]);
-			sp[tempid].effectdescnum = atoi(row[157]);
+		sp[tempid].zonetype=atoi(row[101]);
+		sp[tempid].EnvironmentType=atoi(row[102]);
+		sp[tempid].TimeOfDay=atoi(row[103]);
 
-			sp[tempid].npc_no_los = atoi(row[159]) != 0;
-			sp[tempid].reflectable = atoi(row[161]) != 0;
-			sp[tempid].bonushate=atoi(row[162]);
+		for(y=0; y < PLAYER_CLASS_COUNT;y++)
+			sp[tempid].classes[y]=atoi(row[104+y]);
 
-			sp[tempid].EndurCost=atoi(row[166]);
-			sp[tempid].EndurTimerIndex=atoi(row[167]);
-			sp[tempid].IsDisciplineBuff = atoi(row[168]) != 0;
-			sp[tempid].HateAdded=atoi(row[173]);
-			sp[tempid].EndurUpkeep=atoi(row[174]);
-			sp[tempid].numhitstype = atoi(row[175]);
-			sp[tempid].numhits = atoi(row[176]);
-			sp[tempid].pvpresistbase=atoi(row[177]);
-			sp[tempid].pvpresistcalc=atoi(row[178]);
-			sp[tempid].pvpresistcap=atoi(row[179]);
-			sp[tempid].spell_category=atoi(row[180]);
-			sp[tempid].can_mgb=atoi(row[185]);
-			sp[tempid].dispel_flag = atoi(row[186]);
-			sp[tempid].MinResist = atoi(row[189]);
-			sp[tempid].MaxResist = atoi(row[190]);
-			sp[tempid].viral_targets = atoi(row[191]);
-			sp[tempid].viral_timer = atoi(row[192]);
-			sp[tempid].NimbusEffect = atoi(row[193]);
-			sp[tempid].directional_start = static_cast<float>(atoi(row[194]));
-			sp[tempid].directional_end = static_cast<float>(atoi(row[195]));
-			sp[tempid].not_extendable = atoi(row[197]) != 0;
-			sp[tempid].suspendable = atoi(row[200]) != 0;
-			sp[tempid].viral_range = atoi(row[201]);
-			sp[tempid].spellgroup=atoi(row[207]);
-			sp[tempid].rank = atoi(row[208]);
-			sp[tempid].powerful_flag=atoi(row[209]);
-			sp[tempid].CastRestriction = atoi(row[211]);
-			sp[tempid].AllowRest = atoi(row[212]) != 0;
-			sp[tempid].InCombat = atoi(row[213]) != 0;
-			sp[tempid].OutofCombat = atoi(row[214]) != 0;
-			sp[tempid].aemaxtargets = atoi(row[218]);
-			sp[tempid].maxtargets = atoi(row[219]);
-			sp[tempid].persistdeath = atoi(row[224]) != 0;
-			sp[tempid].min_dist = atof(row[227]);
-			sp[tempid].min_dist_mod = atof(row[228]);
-			sp[tempid].max_dist = atof(row[229]);
-			sp[tempid].max_dist_mod = atof(row[230]);
-			sp[tempid].min_range = static_cast<float>(atoi(row[231]));
-			sp[tempid].DamageShieldType = 0;
-		}
-		mysql_free_result(result);
+		sp[tempid].CastingAnim=atoi(row[120]);
+		sp[tempid].SpellAffectIndex=atoi(row[123]);
+		sp[tempid].disallow_sit=atoi(row[124]);
 
-		LoadDamageShieldTypes(sp, max_spells);
-	} else {
-		_log(SPELLS__LOAD_ERR, "Error in LoadSpells query '%s' %s", query, errbuf);
-		safe_delete_array(query);
-	}
+		for (y = 0; y < 16; y++)
+			sp[tempid].deities[y]=atoi(row[126+y]);
+
+		sp[tempid].uninterruptable=atoi(row[146]) != 0;
+		sp[tempid].ResistDiff=atoi(row[147]);
+		sp[tempid].dot_stacking_exempt=atoi(row[148]);
+		sp[tempid].RecourseLink = atoi(row[150]);
+		sp[tempid].no_partial_resist = atoi(row[151]) != 0;
+
+		sp[tempid].short_buff_box = atoi(row[154]);
+		sp[tempid].descnum = atoi(row[155]);
+		sp[tempid].effectdescnum = atoi(row[157]);
+
+		sp[tempid].npc_no_los = atoi(row[159]) != 0;
+		sp[tempid].reflectable = atoi(row[161]) != 0;
+		sp[tempid].bonushate=atoi(row[162]);
+
+		sp[tempid].EndurCost=atoi(row[166]);
+		sp[tempid].EndurTimerIndex=atoi(row[167]);
+		sp[tempid].IsDisciplineBuff = atoi(row[168]) != 0;
+		sp[tempid].HateAdded=atoi(row[173]);
+		sp[tempid].EndurUpkeep=atoi(row[174]);
+		sp[tempid].numhitstype = atoi(row[175]);
+		sp[tempid].numhits = atoi(row[176]);
+		sp[tempid].pvpresistbase=atoi(row[177]);
+		sp[tempid].pvpresistcalc=atoi(row[178]);
+		sp[tempid].pvpresistcap=atoi(row[179]);
+		sp[tempid].spell_category=atoi(row[180]);
+		sp[tempid].can_mgb=atoi(row[185]);
+		sp[tempid].dispel_flag = atoi(row[186]);
+		sp[tempid].MinResist = atoi(row[189]);
+		sp[tempid].MaxResist = atoi(row[190]);
+		sp[tempid].viral_targets = atoi(row[191]);
+		sp[tempid].viral_timer = atoi(row[192]);
+		sp[tempid].NimbusEffect = atoi(row[193]);
+		sp[tempid].directional_start = static_cast<float>(atoi(row[194]));
+		sp[tempid].directional_end = static_cast<float>(atoi(row[195]));
+		sp[tempid].not_extendable = atoi(row[197]) != 0;
+		sp[tempid].suspendable = atoi(row[200]) != 0;
+		sp[tempid].viral_range = atoi(row[201]);
+		sp[tempid].spellgroup=atoi(row[207]);
+		sp[tempid].rank = atoi(row[208]);
+		sp[tempid].powerful_flag=atoi(row[209]);
+		sp[tempid].CastRestriction = atoi(row[211]);
+		sp[tempid].AllowRest = atoi(row[212]) != 0;
+		sp[tempid].InCombat = atoi(row[213]) != 0;
+		sp[tempid].OutofCombat = atoi(row[214]) != 0;
+		sp[tempid].aemaxtargets = atoi(row[218]);
+		sp[tempid].maxtargets = atoi(row[219]);
+		sp[tempid].persistdeath = atoi(row[224]) != 0;
+		sp[tempid].min_dist = atof(row[227]);
+		sp[tempid].min_dist_mod = atof(row[228]);
+		sp[tempid].max_dist = atof(row[229]);
+		sp[tempid].max_dist_mod = atof(row[230]);
+		sp[tempid].min_range = static_cast<float>(atoi(row[231]));
+		sp[tempid].DamageShieldType = 0;
+    }
+
+    LoadDamageShieldTypes(sp, max_spells);
 }
 
 int SharedDatabase::GetMaxBaseDataLevel() {