* Merge.

--HG--
branch : trunk

src/game/Player.cpp

@@ -17052,15 +17052,11 @@ void Player::SaveToDB()
     sLog.outDebug("The value of player %s at save: ", m_name.c_str());
     outDebugValues();
 
-    CharacterDatabase.BeginTransaction();
-
-    CharacterDatabase.PExecute("DELETE FROM characters WHERE guid = '%u'",GetGUIDLow());
-
     std::string sql_name = m_name;
     CharacterDatabase.escape_string(sql_name);
 
     std::ostringstream ss;
-    ss << "INSERT INTO characters (guid,account,name,race,class,gender,level,xp,money,playerBytes,playerBytes2,playerFlags,"
+    ss << "REPLACE INTO characters (guid,account,name,race,class,gender,level,xp,money,playerBytes,playerBytes2,playerFlags,"
         "map, instance_id, dungeon_difficulty, position_x, position_y, position_z, orientation, data, "
         "taximask, online, cinematic, "
         "totaltime, leveltime, rest_bonus, logout_time, is_logout_resting, resettalents_cost, resettalents_time, "
@@ -17152,6 +17148,8 @@ void Player::SaveToDB()
     ss << uint32(m_activeSpec);
     ss << ")";
 
+    CharacterDatabase.BeginTransaction();
+
     CharacterDatabase.Execute( ss.str().c_str() );
 
     if (m_mailsUpdated)                                     //save mails only when needed