[noudess]

I am brand new to git, so I may have done something wrong, but it looks to be wrong still:

I did an uptream fetch and got 5 commits from the main line, but I still need to make this change.

I can commit this so I learn about git if you want.

-- a/common/database.cpp
+++ b/common/database.cpp
@@ -771,7 +771,7 @@ uint32 Database::GetCharacterID(const char *name) {
Zero will also be returned if there is a database error.
*/
uint32 Database::GetAccountIDByChar(const char* charname, uint32* oCharID) {
- std::string query = StringFormat("SELECT account_id, id FROM character_ WHERE name='%s'", EscapeString(charname).c_str());
+ std::string query = StringFormat("SELECT account_id, id FROM character_data WHERE name='%s'", EscapeString(charname).c_str());