Merge branch 'master' into eqstream_ptr

common/database.cpp

@@ -1991,7 +1991,7 @@ void Database::SetRaidGroupLeaderInfo(uint32 gid, uint32 rid)
 	if (results.RowsAffected() != 0)
 		return;
 
-	query = StringFormat("INSERT INTO raid_leaders(gid, rid, marknpc, leadershipaa, maintank, assist, puller, mentoree, mentor_percent) VALUES(%lu, %lu, '', '', '', '', '', '', 0)",
+	query = StringFormat("REPLACE INTO raid_leaders(gid, rid, marknpc, leadershipaa, maintank, assist, puller, mentoree, mentor_percent) VALUES(%lu, %lu, '', '', '', '', '', '', 0)",
 			(unsigned long)gid, (unsigned long)rid);
 	results = QueryDatabase(query);
 

common/eqemu_logsys.h

@@ -77,6 +77,7 @@ namespace Logs{
 		MySQLError,
 		MySQLQuery,
 		Mercenaries,
+		QuestDebug,
 		MaxCategoryID	/* Don't Remove this*/
 	};
 
@@ -120,6 +121,7 @@ namespace Logs{
 		"MySQL Error",
 		"MySQL Query",
 		"Mercenaries",
+		"Quest Debug",
 	};
 }
 
@@ -141,7 +143,7 @@ public:
 				be checked against to see if that piped output is set to actually process it for the category and debug level
 	*/
 	void Out(Logs::DebugLevel debug_level, uint16 log_category, std::string message, ...);
-	void SetCurrentTimeStamp(char* time_stamp); /* Used in file logs to prepend a timestamp entry for logs */
+	void SetCurrentTimeStamp(char* time_stamp); /* Used in file logs to prepend a timestamp entry for logs */ 
 	void StartFileLogs(const std::string &log_name = ""); /* Used to declare the processes file log and to keep it open for later use */
 
 	/*

common/version.h

@@ -30,7 +30,7 @@
 	Manifest: https://github.com/EQEmu/Server/blob/master/utils/sql/db_update_manifest.txt	
 */
 
-#define CURRENT_BINARY_DATABASE_VERSION 9069
+#define CURRENT_BINARY_DATABASE_VERSION 9071
 #define COMPILE_DATE	__DATE__
 #define COMPILE_TIME	__TIME__
 #ifndef WIN32