[Sync] Some minor cross project sync

This commit is contained in:
Antz 2020-01-09 08:30:20 +00:00
parent 4f8b995d89
commit 49fe617b55
16 changed files with 212 additions and 153 deletions

View file

@ -66,7 +66,9 @@ DatabaseMysql::~DatabaseMysql()
// Free Mysql library pointers for last ~DB
if (--db_count == 0)
{ mysql_library_end(); }
{
mysql_library_end();
}
}
SqlConnection* DatabaseMysql::CreateConnection()

View file

@ -274,7 +274,6 @@ void SQLStorageLoaderBase<DerivedLoader, StorageClass>::Load(StorageClass& store
return;
}
// sLog.outErrorDb("Total # of fields in database: %u - total # of expected fields %u", result->GetFieldCount(), store.GetSrcFieldCount());
if (store.GetSrcFieldCount() != result->GetFieldCount())
{
recordCount = 0;
@ -373,13 +372,10 @@ void SQLStorageLoaderBase<DerivedLoader, StorageClass>::Load(StorageClass& store
}
++y;
}
// check on the contents of the fields
// sLog.outErrorDb("Entry: %u - InhabitType %u - NPC Flags %u - Unit Flags %u", (*result)[0].GetUInt32(), (*result)[18].GetUInt32(), (*result)[21].GetUInt32(), (*result)[22].GetUInt32());
}
while (result->NextRow());
delete result;
}
}
#endif